diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 17:01:26 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 17:01:26 -0800 |
| commit | 595785701d1fe44d8abac5a1454f2468a0482bf0 (patch) | |
| tree | a64680a308c1824001e0d6f92be804992d70e629 /lib/getopt.in.h | |
| parent | c5aff743c3963a8fdaab628d2b695df50432e0de (diff) | |
| download | emacs-595785701d1fe44d8abac5a1454f2468a0482bf0.tar.gz | |
gnulib: allow multiple gnulib generated replacements to coexist
This defines a few preprocessor symbols that should not affect Emacs.
* lib/getopt.in.h, lib/time.in.h, lib/unistd.in.h: Regenerate
via "make sync-from-gnulib".
Diffstat (limited to 'lib/getopt.in.h')
| -rw-r--r-- | lib/getopt.in.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 9b0a9a58bc9..82e2937d6d2 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -181,6 +181,7 @@ extern int optopt; one). For long options that have a zero `flag' field, `getopt' returns the contents of the `val' field. */ +# if !GNULIB_defined_struct_option struct option { const char *name; @@ -190,6 +191,8 @@ struct option int *flag; int val; }; +# define GNULIB_defined_struct_option 1 +# endif /* Names for the values of the `has_arg' field of `struct option'. */ |