Mercurial > hg > xemacs-beta

comparison lib-src/getopt.h @ 5091:ed624ab64583

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compile errors/warnings -------------------- ChangeLog entries follow: -------------------- lib-src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * digest-doc.c: * make-path.c: `emacs' isn't defined, but HAVE_CONFIG_H is, so use it to get config.h. * getopt.h: Conditionalize on HAVE_CONFIG_H to get real prototypes. src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * Makefile.in.in: * Makefile.in.in (objs): glyphs-shared.o, glyphs-eimage.o only needed when HAVE_WINDOW_SYSTEM. glyphs-widget.o should be too, but we need a bit of work ifdeffing out the subwindow stuff from redisplay.c et al. * bytecode.c (init_opcode_table_multi_op): Change var name to avoid shadowing with `basename'. * emacs.c (main_1): Don't call init/etc. routines for glyphs-shared, glyphs-eimage unless HAVE_WINDOW_SYSTEM is defined. * linuxplay.c: * linuxplay.c (sighandler): * vdb-posix.c (vdb_fault_handler): Use const for variables holding string constants to avoid C++ warnings.
author Ben Wing <ben@xemacs.org>
date Tue, 02 Mar 2010 05:22:10 -0600
parents abe6d1db359e
children 061f4f90f874
comparison
equal deleted inserted replaced
5083:88f955fa5a7f 5091:ed624ab64583
96 96
97 #define no_argument 0 97 #define no_argument 0
98 #define required_argument 1 98 #define required_argument 1
99 #define optional_argument 2 99 #define optional_argument 2
100 100
101 #if defined (__GNU_LIBRARY__) || defined (__cplusplus) || defined (CYGWIN) 101 #if defined (__GNU_LIBRARY__) || defined (__cplusplus) || defined (HAVE_CONFIG_H)
102 /* Many other libraries have conflicting prototypes for getopt, with 102 /* Many other libraries have conflicting prototypes for getopt, with
103 differences in the consts, in stdlib.h. To avoid compilation 103 differences in the consts, in stdlib.h. To avoid compilation
104 errors, only prototype getopt for the GNU C library. */ 104 errors, only prototype getopt for the GNU C library. */
105 extern int getopt (int argc, char *const *argv, const char *shortopts); 105 extern int getopt (int argc, char *const *argv, const char *shortopts);
106 #else /* not __GNU_LIBRARY__ || C++ */ 106 #else /* not __GNU_LIBRARY__ || C++ */