libiberty.h inclusion modified

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 :

src/frontend/inp.c

@@ -16,11 +16,6 @@ $Id$
 #define HAVE_DECL_BASENAME 1
 #endif
 
-#ifdef HAVE_LIBIBERTY_H /* asprintf etc. */
-#include <libiberty.h>
-#undef AND /* obsolete macro in ansidecl.h */
-#endif
-
 #include "cpdefs.h"
 #include "inpdefs.h"
 #include "ftedefs.h"

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 <libiberty.h>
-#undef AND /* obsolete macro in ansidecl.h */
-#endif
-
 #include "cpdefs.h"
 #include "ftedefs.h"
 #include "fteext.h"

src/frontend/terminal.c

@@ -22,8 +22,15 @@ $Id$
 #include <sys/ioctl.h>
 #endif
 
+#ifdef HAVE_ASPRINTF
 #ifdef HAVE_LIBIBERTY_H /* asprintf */
 #include <libiberty.h>
+#undef AND /* obsolete macro in ansidecl.h */
+#else /* we have asprintf, but not libiberty.h */
+#include <stdarg.h>
+extern int asprintf(char **out, const char *fmt, ...);
+extern int vasprintf(char **out, const char *fmt, va_list ap);
+#endif
 #endif
 
 #if 0

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 {

src/main.c

@@ -13,9 +13,15 @@
 #include <setjmp.h>
 #include <signal.h>
 
+#ifdef HAVE_ASPRINTF
 #ifdef HAVE_LIBIBERTY_H /* asprintf */
 #include <libiberty.h>
 #undef AND /* obsolete macro in ansidecl.h */
+#else /* we have asprintf, but not libiberty.h */
+#include <stdarg.h>
+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 */

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 <libiberty.h>
+#undef AND /* obsolete macro in ansidecl.h */
+#else /* we have asprintf, but not libiberty.h */
+#include <stdarg.h>
+extern int asprintf(char **out, const char *fmt, ...);
+extern int vasprintf(char **out, const char *fmt, va_list ap);
+#endif
 #endif
 
 char *Spice_Path;

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 <libiberty.h>
 #undef AND /* obsolete macro in ansidecl.h */
+#else /* we have asprintf, but not libiberty.h */
+#include <stdarg.h>
+extern int asprintf(char **out, const char *fmt, ...);
+extern int vasprintf(char **out, const char *fmt, va_list ap);
+#endif
 #endif
 
 #include <wordlist.h>

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 <libiberty.h>
 #undef AND /* obsolete macro in ansidecl.h */
+#else /* we have asprintf, but not libiberty.h */
+#include <stdarg.h>
+extern int asprintf(char **out, const char *fmt, ...);
+extern int vasprintf(char **out, const char *fmt, va_list ap);
+#endif
 #endif
 
 #include "fteext.h"

src/tclspice.c

@@ -137,7 +137,16 @@ extern JMP_BUF jbuf;
 #define S_IRWXU _S_IWRITE
 #endif
 
-//#include <stdarg.h>     /* for va_copy() */
+#ifdef HAVE_ASPRINTF
+#ifdef HAVE_LIBIBERTY_H /* asprintf */
+#include <libiberty.h>
+#undef AND /* obsolete macro in ansidecl.h */
+#else /* we have asprintf, but not libiberty.h */
+#include <stdarg.h>
+extern int asprintf(char **out, const char *fmt, ...);
+extern int vasprintf(char **out, const char *fmt, va_list ap);
+#endif
+#endif
 
 extern IFfrontEnd nutmeginfo;