diff options
| author | Chris Hall <GMCH@hestia.halldom.com> | 2010-04-17 10:54:47 +0100 |
|---|---|---|
| committer | Chris Hall <GMCH@hestia.halldom.com> | 2010-04-17 10:54:47 +0100 |
| commit | 68297cc9dc2eb920dd6e956d0d55098ea9edaafc (patch) | |
| tree | c0df43727c1eaf78915caa98433d39028b6a4902 /lib/getopt1.c | |
| parent | d78a0a9e3552c77be930aa30f04786f0c5214a6f (diff) | |
| download | quagga-68297cc9dc2eb920dd6e956d0d55098ea9edaafc.tar.bz2 quagga-68297cc9dc2eb920dd6e956d0d55098ea9edaafc.tar.xz | |
Put back some Quagga additions to getopt.c etc.
Also, backed out a small change in zebra/misc_null.c, which removed
a warning, but on reflection may be using deep magic which is not
fully understood (by me, anyway). zebra appears to have a number
of definitions for the same function, and how that is all linked
is not obvious (to me, anyway).
Diffstat (limited to 'lib/getopt1.c')
| -rw-r--r-- | lib/getopt1.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/getopt1.c b/lib/getopt1.c index 166abac5..a8ec9e98 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -24,18 +24,11 @@ #include <config.h>
#endif
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-#ifndef const
-#define const
-#endif
-#endif
+#include "zebra.h"
+#include "getopt.h"
#include <stdio.h>
-#include "getopt.h"
-
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C
Library, but also included in many other GNU distributions. Compiling
|