From 68297cc9dc2eb920dd6e956d0d55098ea9edaafc Mon Sep 17 00:00:00 2001 From: Chris Hall Date: Sat, 17 Apr 2010 10:54:47 +0100 Subject: 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). --- lib/getopt1.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'lib/getopt1.c') 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 #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 -#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 -- cgit v1.2.3