diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-10-22 01:56:48 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-10-22 09:53:19 +0000 |
| commit | 5f68435a079dc7ce633e1da22f363e4e715d66f6 (patch) | |
| tree | 991ee597634ef3d85646f0b70e931e699cd059f2 /ConfigureChecks.cmake | |
| parent | d32fee2d6252c485dacdf51441d7ba5c6d37d7f3 (diff) | |
| download | wireshark-5f68435a079dc7ce633e1da22f363e4e715d66f6.tar.gz wireshark-5f68435a079dc7ce633e1da22f363e4e715d66f6.tar.bz2 wireshark-5f68435a079dc7ce633e1da22f363e4e715d66f6.zip | |
Fix the #defines for the presence of structure names.
AC_CHECK_MEMBER() and AC_CHECK_MEMBERS() use a standard name for the
{structurename} being the name of the structure type, complete with
"struct" if a typedef wasn't used, and with all letters mapped to upper
case, and with {membername} being the name of the structure member, with
all letters mapped to upper case.
check_struct_has_member() lets you choose the name; choose the same name
that the autoconf macros use, and fix the code to check for them.
Change-Id: Ifb3cf65e7e94907ad0a2f8aacca0c21a531f0c5b
Reviewed-on: https://code.wireshark.org/review/18382
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 01273f5cbd..c4bd431a1a 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -134,10 +134,10 @@ endif() #Struct members include(CheckStructHasMember) -check_struct_has_member("struct sockaddr" sa_len sys/socket.h HAVE_SOCKADDR_SA_LEN) -check_struct_has_member("struct stat" st_flags sys/stat.h HAVE_STAT_ST_FLAGS) -check_struct_has_member("struct stat" st_birthtime sys/stat.h HAVE_STAT_ST_BIRTHTIME) -check_struct_has_member("struct stat" __st_birthtime sys/stat.h HAVE_STAT___ST_BIRTHTIME) +check_struct_has_member("struct sockaddr" sa_len sys/socket.h HAVE_STRUCT_SOCKADDR_SA_LEN) +check_struct_has_member("struct stat" st_flags sys/stat.h HAVE_STRUCT_STAT_ST_FLAGS) +check_struct_has_member("struct stat" st_birthtime sys/stat.h HAVE_STRUCT_STAT_ST_BIRTHTIME) +check_struct_has_member("struct stat" __st_birthtime sys/stat.h HAVE_STRUCT_STAT___ST_BIRTHTIME) check_struct_has_member("struct tm" tm_zone time.h HAVE_STRUCT_TM_TM_ZONE) #Symbols but NOT enums or types |