From 355384e459ac557c15d57f098ec91f750711e392 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Fri, 10 Sep 2010 15:06:04 +0000 Subject: [PATCH] libiberty.h inclusion modified --- ChangeLog | 6 ++++++ src/frontend/inp.c | 5 ----- src/frontend/inpcom.c | 5 ----- src/frontend/terminal.c | 7 +++++++ src/include/fteparse.h | 2 ++ src/main.c | 6 ++++++ src/misc/ivars.c | 7 +++++++ src/spicelib/parser/ifnewuid.c | 6 ++++++ src/spicelib/parser/inperror.c | 6 ++++++ src/tclspice.c | 11 ++++++++++- 10 files changed, 50 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f64bfdead..2a785554d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-08 Holger Vogt + * inp.c, inpcom.c: include libiberty.h removed + * terminal.c, ivars.c, ifnewuid.c, inperror.c, tclspice.c, main.c: + rework of #ifdef HAVE_ASPRINTF ... + * fteparse.h: #undef AND /* obsolete macro in ansidecl.h */ added + 2010-09-08 Robert Larice * src/frontend/wdisp/windisp.c , * src/frontend/wdisp/winprint.c : diff --git a/src/frontend/inp.c b/src/frontend/inp.c index f42b93c7e..aa4cd7b8e 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -16,11 +16,6 @@ $Id$ #define HAVE_DECL_BASENAME 1 #endif -#ifdef HAVE_LIBIBERTY_H /* asprintf etc. */ -#include -#undef AND /* obsolete macro in ansidecl.h */ -#endif - #include "cpdefs.h" #include "inpdefs.h" #include "ftedefs.h" diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index df09679b1..5aba8bd7e 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -37,11 +37,6 @@ Author: 1985 Wayne A. Christopher #define HAVE_DECL_BASENAME 1 #endif -#ifdef HAVE_LIBIBERTY_H /* asprintf etc. */ -#include -#undef AND /* obsolete macro in ansidecl.h */ -#endif - #include "cpdefs.h" #include "ftedefs.h" #include "fteext.h" diff --git a/src/frontend/terminal.c b/src/frontend/terminal.c index 91d2b4a6c..846d4172f 100644 --- a/src/frontend/terminal.c +++ b/src/frontend/terminal.c @@ -22,8 +22,15 @@ $Id$ #include #endif +#ifdef HAVE_ASPRINTF #ifdef HAVE_LIBIBERTY_H /* asprintf */ #include +#undef AND /* obsolete macro in ansidecl.h */ +#else /* we have asprintf, but not libiberty.h */ +#include +extern int asprintf(char **out, const char *fmt, ...); +extern int vasprintf(char **out, const char *fmt, va_list ap); +#endif #endif #if 0 diff --git a/src/include/fteparse.h b/src/include/fteparse.h index efe2f75a8..6613a26fb 100644 --- a/src/include/fteparse.h +++ b/src/include/fteparse.h @@ -22,6 +22,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #endif #include "pnode.h" +#undef AND /* obsolete macro in ansidecl.h */ + /* Operations. These should really be considered functions. */ struct op { diff --git a/src/main.c b/src/main.c index 7794e0a8e..f8889e00d 100644 --- a/src/main.c +++ b/src/main.c @@ -13,9 +13,15 @@ #include #include +#ifdef HAVE_ASPRINTF #ifdef HAVE_LIBIBERTY_H /* asprintf */ #include #undef AND /* obsolete macro in ansidecl.h */ +#else /* we have asprintf, but not libiberty.h */ +#include +extern int asprintf(char **out, const char *fmt, ...); +extern int vasprintf(char **out, const char *fmt, va_list ap); +#endif #endif /* MINGW: random, srandom in libiberty.a, but not in libiberty.h */ diff --git a/src/misc/ivars.c b/src/misc/ivars.c index 1efd08356..39e7000eb 100644 --- a/src/misc/ivars.c +++ b/src/misc/ivars.c @@ -5,8 +5,15 @@ Copyright 1991 Regents of the University of California. All rights reserved. #include "ngspice.h" #include "ivars.h" +#ifdef HAVE_ASPRINTF #ifdef HAVE_LIBIBERTY_H /* asprintf */ #include +#undef AND /* obsolete macro in ansidecl.h */ +#else /* we have asprintf, but not libiberty.h */ +#include +extern int asprintf(char **out, const char *fmt, ...); +extern int vasprintf(char **out, const char *fmt, va_list ap); +#endif #endif char *Spice_Path; diff --git a/src/spicelib/parser/ifnewuid.c b/src/spicelib/parser/ifnewuid.c index 182b37f09..a04c0370f 100644 --- a/src/spicelib/parser/ifnewuid.c +++ b/src/spicelib/parser/ifnewuid.c @@ -5,9 +5,15 @@ Author: 1988 Thomas L. Quarles #include "ngspice.h" +#ifdef HAVE_ASPRINTF #ifdef HAVE_LIBIBERTY_H /* asprintf */ #include #undef AND /* obsolete macro in ansidecl.h */ +#else /* we have asprintf, but not libiberty.h */ +#include +extern int asprintf(char **out, const char *fmt, ...); +extern int vasprintf(char **out, const char *fmt, va_list ap); +#endif #endif #include diff --git a/src/spicelib/parser/inperror.c b/src/spicelib/parser/inperror.c index 94a2cf732..82cc2e8b1 100644 --- a/src/spicelib/parser/inperror.c +++ b/src/spicelib/parser/inperror.c @@ -9,9 +9,15 @@ Author: 1985 Thomas L. Quarles #include "ngspice.h" +#ifdef HAVE_ASPRINTF #ifdef HAVE_LIBIBERTY_H /* asprintf */ #include #undef AND /* obsolete macro in ansidecl.h */ +#else /* we have asprintf, but not libiberty.h */ +#include +extern int asprintf(char **out, const char *fmt, ...); +extern int vasprintf(char **out, const char *fmt, va_list ap); +#endif #endif #include "fteext.h" diff --git a/src/tclspice.c b/src/tclspice.c index 58ff33f0e..f64334440 100755 --- a/src/tclspice.c +++ b/src/tclspice.c @@ -137,7 +137,16 @@ extern JMP_BUF jbuf; #define S_IRWXU _S_IWRITE #endif -//#include /* for va_copy() */ +#ifdef HAVE_ASPRINTF +#ifdef HAVE_LIBIBERTY_H /* asprintf */ +#include +#undef AND /* obsolete macro in ansidecl.h */ +#else /* we have asprintf, but not libiberty.h */ +#include +extern int asprintf(char **out, const char *fmt, ...); +extern int vasprintf(char **out, const char *fmt, va_list ap); +#endif +#endif extern IFfrontEnd nutmeginfo;