From 67bf8c93ccc0bd194b2ad6f52da47b12819c6688 Mon Sep 17 00:00:00 2001
From: h_vogt <h_vogt>
Date: Sat, 31 Jan 2009 14:32:12 +0000
Subject: [PATCH] incomptibility to MAC OSX removed

---
 ChangeLog                        | 4 ++++
 src/frontend/hpgl.c              | 2 +-
 src/frontend/numparam/numparam.h | 4 ----
 src/frontend/numparam/spicenum.c | 3 +++
 src/frontend/numparam/xpressn.c  | 1 +
 src/frontend/runcoms2.c          | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00cfeb800..0f3809945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-31 Holger Vogt
+ * xpressn.c, spicenum.c, numparam.h, runcoms.c, runcoms2.c:
+   Incompatibilty to MAC OSX removed by proper variable declarations
+
 2009-01-26 Lionel Sainte Cluque
  * man/man1/ngspice.1,
  * man/man1/nutmeg.1:
diff --git a/src/frontend/hpgl.c b/src/frontend/hpgl.c
index bc96abb84..0fa294514 100644
--- a/src/frontend/hpgl.c
+++ b/src/frontend/hpgl.c
@@ -75,7 +75,7 @@ static char *linestyle[] = {
                 };
 
 static FILE *plotfile;
-char psfont[128], psfontsize[32], psscale[32];
+extern char psscale[32];
 static int fontwidth  = FONTWIDTH;
 static int fontheight = FONTHEIGHT;
 static int   jgmult      = 10;
diff --git a/src/frontend/numparam/numparam.h b/src/frontend/numparam/numparam.h
index ff34ef724..8f71c9241 100644
--- a/src/frontend/numparam/numparam.h
+++ b/src/frontend/numparam/numparam.h
@@ -76,7 +76,3 @@ void nupa_subcktexit( tdico *dico);
  tdico * nupa_fetchinstance(void);
  char getidtype( tdico *d, char * s);
  int attrib( tdico *dico, char * t, char op );
-
-char *nupa_inst_name;
-tdico *inst_dico;
- 
diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c
index 76c79a1b9..6316613b3 100644
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@@ -29,6 +29,9 @@ Todo:
 
 extern void txfree (void *ptr);
 
+char *nupa_inst_name;
+static tdico *inst_dico;
+
 /* Uncomment this line to allow debug tracing */
 /* #define TRACE_NUMPARAMS */
 
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index c9f7cec45..ab40c10dc 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -19,6 +19,7 @@ extern double gauss();
 static Str (150, keys);                /* all my keywords */
 static Str (150, fmath);        /* all math functions */
 
+extern char *nupa_inst_name; /* see spicenum.c */
 
 static double
 ternary_fcn (int conditional, double if_value, double else_value)
diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index 8f0c8b4c2..5c0afb706 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -25,7 +25,7 @@ $Id$
 #include "inpdefs.h"
 
 #define RAWBUF_SIZE 32768
-char rawfileBuf[RAWBUF_SIZE];
+extern char rawfileBuf[RAWBUF_SIZE];
 
 /* Continue a simulation. If there is non in progress, this is the
  * equivalent of "run".