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 /ui/gtk | |
| parent | d32fee2d6252c485dacdf51441d7ba5c6d37d7f3 (diff) | |
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 'ui/gtk')
| -rw-r--r-- | ui/gtk/file_dlg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c index 47e443dcff..72acf6029b 100644 --- a/ui/gtk/file_dlg.c +++ b/ui/gtk/file_dlg.c @@ -304,9 +304,9 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name) return TRUE; } - /* OK, we have the permission bits and, if HAVE_STAT_ST_FLAGS is defined, - the flags. (If we don't, we don't worry about it.) */ -#ifdef HAVE_STAT_ST_FLAGS + /* OK, we have the permission bits and, if HAVE_STRUCT_STAT_ST_FLAGS + is defined, the flags. (If we don't, we don't worry about it.) */ +#ifdef HAVE_STRUCT_STAT_ST_FLAGS if (statbuf.st_flags & UF_IMMUTABLE) { display_basename = g_filename_display_basename(cf_name); msg_dialog = gtk_message_dialog_new(GTK_WINDOW(chooser_w), @@ -325,7 +325,7 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name) display_basename); g_free(display_basename); } else -#endif /* HAVE_STAT_ST_FLAGS */ +#endif /* HAVE_STRUCT_STAT_ST_FLAGS */ if ((statbuf.st_mode & (S_IWUSR|S_IWGRP|S_IWOTH)) == 0) { display_basename = g_filename_display_basename(cf_name); msg_dialog = gtk_message_dialog_new(GTK_WINDOW(chooser_w), @@ -358,7 +358,7 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name) return FALSE; } -#ifdef HAVE_STAT_ST_FLAGS +#ifdef HAVE_STRUCT_STAT_ST_FLAGS /* OK, they want to overwrite the file. If it has the "user immutable" flag, we have to turn that off first, so we can move on top of, or overwrite, the file. */ |