diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-13 10:15:25 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-13 19:09:36 +0000 |
| commit | 246f0bc0125eb2137781f5f8bfad783a2f7ac4cd (patch) | |
| tree | ab379a95c861f64072d1099fb6ea687c639f6c45 /wiretap | |
| parent | fa278335483da207150f8680811ad5f9545ab57d (diff) | |
Get rid of TestBigEndian and AC_C_BIGENDIAN.
Get rid of CMake's TestBigEndian and Autotools' AC_C_BIGENDIAN checks in
favor of G_BYTE_ORDER. We use G_BYTE_ORDER elsewhere and TestBigEndian
is noticeably slow on Windows.
Change-Id: Idc1326294db9cbee8f6b6b11c2028fc4d19acbf0
Reviewed-on: https://code.wireshark.org/review/26462
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/lanalyzer.c | 2 | ||||
| -rw-r--r-- | wiretap/netmon.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 00dbfa9c0c..f283c9bc1c 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -607,7 +607,7 @@ static gboolean s32write(wtap_dumper *wdh, const guint32 s32, int *err) *---------------------------------------------------*/ static gboolean s48write(wtap_dumper *wdh, const guint64 s48, int *err) { -#ifdef WORDS_BIGENDIAN +#if G_BYTE_ORDER == G_BIG_ENDIAN guint16 s48_upper_le = GUINT16_SWAP_LE_BE((guint16) (s48 >> 32)); guint32 s48_lower_le = GUINT32_SWAP_LE_BE((guint32) (s48 & 0xFFFFFFFF)); #else diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 6d365263a3..6acf402c40 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -240,7 +240,7 @@ wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info) GHashTable *comment_table, *process_info_table; struct netmonrec_comment* comment_rec; gint64 file_size = wtap_file_size(wth, err); -#ifdef WORDS_BIGENDIAN +#if G_BYTE_ORDER == G_BIG_ENDIAN unsigned int i; #endif netmon_t *netmon; @@ -729,7 +729,7 @@ wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info) netmon->process_info_table = process_info_table; } -#ifdef WORDS_BIGENDIAN +#if G_BYTE_ORDER == G_BIG_ENDIAN /* * OK, now byte-swap the frame table. */ |