From 5f68435a079dc7ce633e1da22f363e4e715d66f6 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 22 Oct 2016 01:56:48 -0700 Subject: 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 Reviewed-by: Guy Harris --- cmakeconfig.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmakeconfig.h.in') diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index c206545335..abf94fdbc8 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -295,7 +295,7 @@ #cmakedefine HAVE_REMOTE 1 /* Define if sa_len field exists in struct sockaddr */ -#cmakedefine HAVE_SOCKADDR_SA_LEN 1 +#cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1 /* Define to 1 if you want to playing SBC by standalone BlueZ SBC library */ #cmakedefine HAVE_SBC 1 @@ -322,7 +322,7 @@ #cmakedefine HAVE_STRUCT_STAT_ST_BIRTHTIME 1 /* Define if st_flags field exists in struct stat */ -#cmakedefine HAVE_STAT_ST_FLAGS 1 +#cmakedefine HAVE_STRUCT_STAT_ST_FLAGS 1 /* Define to 1 if `__st_birthtime' is a member of `struct stat'. */ #cmakedefine HAVE_STRUCT_STAT___ST_BIRTHTIME 1 -- cgit v1.2.3