proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 08:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2005-05-15 Paul Jakma <paul@dishone.st>

Browse Source 
* getopt.h: It's not just __GNU_LIBRARY__ which defines
	  getopt, eg __EXTENSIONS__ does too on SunOS. It still seems
	  awfully fragile though.
	* getopt.c: include zebra.h after config.h, before including
	  getopt.h so that things at least are consistent..
	* getopt1.c: ditto
This commit is contained in:
paul 2005-05-15 14:25:08 +00:00
parent 14c1f187ac
commit 024a7f0697
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ChangeLog
View File

@ -1,3 +1,12 @@
2005-05-15 Paul Jakma <paul@dishone.st>
* getopt.h: It's not just __GNU_LIBRARY__ which defines
getopt, eg __EXTENSIONS__ does too on SunOS. It still seems
awfully fragile though.
* getopt.c: include zebra.h after config.h, before including
getopt.h so that things at least are consistent..
* getopt1.c: ditto
2005-05-07 Yar Tikhiy <yar@comp.chem.msu.su> 2005-05-07 Yar Tikhiy <yar@comp.chem.msu.su>
* sockopt.c: Add support for BSD style ifindex in ip_mreq. * sockopt.c: Add support for BSD style ifindex in ip_mreq.

2
lib/getopt.c
View File

@ -34,6 +34,8 @@
# include <config.h> # include <config.h>
#endif #endif
#include <zebra.h>
#if !defined __STDC__ || !__STDC__ #if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems /* This is a separate conditional since some stdc systems
reject `defined (const)'. */ reject `defined (const)'. */

4
lib/getopt.h
View File

@ -99,12 +99,12 @@ struct option
#define optional_argument 2 #define optional_argument 2
#if defined (__STDC__) && __STDC__ #if defined (__STDC__) && __STDC__
#ifdef __GNU_LIBRARY__ #if defined (__GNU_LIBRARY__) || defined (__EXTENSIONS__)
/* Many other libraries have conflicting prototypes for getopt, with /* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */ errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts); extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */ #else /* not __GNU_LIBRARY__ or __EXTENSIONS__ */
extern int getopt (void); extern int getopt (void);
#endif /* __GNU_LIBRARY__ */ #endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts, extern int getopt_long (int argc, char *const *argv, const char *shortopts,

1
lib/getopt1.c
View File

@ -24,6 +24,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <zebra.h>
#include "getopt.h" #include "getopt.h"
#if !defined __STDC__ || !__STDC__ #if !defined __STDC__ || !__STDC__