From 0618ecbf8bc07ccca88b190df261197eb7081a89 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Wed, 28 Nov 2007 17:38:00 +0000
Subject: [PATCH] prototypes for asprintf

---
 src/main.c                     | 7 +++++--
 src/misc/ivars.c               | 9 +++------
 src/spicelib/parser/ifnewuid.c | 6 +++---
 src/spicelib/parser/inperror.c | 8 +++++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main.c b/src/main.c
index 5157df940..29736240f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,9 +8,12 @@
    $Id$
 */
 
-#include <ngspice.h>
+#include "ngspice.h"
 
-#include <stdio.h>
+#ifdef HAVE_LIBIBERTY_H /* asprintf */
+#include <libiberty.h>
+#undef AND /* obsolete macro in ansidecl.h */
+#endif
 
 #ifdef HAVE_STRING_H
 #include <string.h>
diff --git a/src/misc/ivars.c b/src/misc/ivars.c
index caa20de82..907cd5415 100644
--- a/src/misc/ivars.c
+++ b/src/misc/ivars.c
@@ -5,12 +5,9 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 #include "ngspice.h"
 #include "ivars.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif /* HAVE_STRING_H */
-
-#include <stdlib.h>
-#include <stdio.h>
+#ifdef HAVE_LIBIBERTY_H /* asprintf */
+#include <libiberty.h>
+#endif
 
 char *Spice_Path;
 char *News_File;
diff --git a/src/spicelib/parser/ifnewuid.c b/src/spicelib/parser/ifnewuid.c
index fac0e5e8d..49d852a26 100644
--- a/src/spicelib/parser/ifnewuid.c
+++ b/src/spicelib/parser/ifnewuid.c
@@ -4,10 +4,10 @@ Author: 1988 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 
-#ifdef HAVE_STRING_H
-#include <string.h>
+#ifdef HAVE_LIBIBERTY_H /* asprintf */
+#include <libiberty.h>
+#undef AND /* obsolete macro in ansidecl.h */
 #endif
 
 #include <wordlist.h>
diff --git a/src/spicelib/parser/inperror.c b/src/spicelib/parser/inperror.c
index 5276c6c11..94a2cf732 100644
--- a/src/spicelib/parser/inperror.c
+++ b/src/spicelib/parser/inperror.c
@@ -8,10 +8,12 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
+
+#ifdef HAVE_LIBIBERTY_H /* asprintf */
+#include <libiberty.h>
+#undef AND /* obsolete macro in ansidecl.h */
 #endif
+
 #include "fteext.h"
 #include "ifsim.h"
 #include "iferrmsg.h"