diff --git a/ChangeLog b/ChangeLog index 25027c200..e6d83430f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-12-17 Robert Larice + * src/winmain.c , + * src/frontend/inpcom.c , + * src/include/ngspice/Makefile.am , + * src/include/ngspice/memory.h , + * src/misc/Makefile.am , + * src/misc/string.c , + * visualc/vngspice.vcproj : + + Added src/include/ngspice/stringutil.h + Removed src/misc/stringutil.h + + move stringutil.h --> src/include/ngspice + 2011-12-17 Holger Vogt * src/frontend/inpcom.c : allow syntax Gxxx n1 n2 value={equation} or Exxx n1 n2 value={equation} diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index c5618dc43..3d497f2ba 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -21,7 +21,7 @@ Author: 1985 Wayne A. Christopher #include "inpcom.h" #include "variable.h" #include "../misc/util.h" /* ngdirname() */ -#include "../misc/stringutil.h" +#include "ngspice/stringutil.h" #include "ngspice/wordlist.h" #ifdef XSPICE diff --git a/src/include/ngspice/Makefile.am b/src/include/ngspice/Makefile.am index 6e2196bad..2a8a3341f 100644 --- a/src/include/ngspice/Makefile.am +++ b/src/include/ngspice/Makefile.am @@ -102,6 +102,7 @@ noinst_HEADERS = \ smpdefs.h \ sperror.h \ spmatrix.h \ + stringutil.h \ suffix.h \ swec.h \ tfdefs.h \ diff --git a/src/include/ngspice/memory.h b/src/include/ngspice/memory.h index 5aa3be6ca..0516aa2f7 100644 --- a/src/include/ngspice/memory.h +++ b/src/include/ngspice/memory.h @@ -23,7 +23,7 @@ extern void txfree(void *ptr); #endif -#include "../misc/stringutil.h" /* va: spice3 internally bzero */ +#include "ngspice/stringutil.h" /* va: spice3 internally bzero */ #define alloc(TYPE) TMALLOC(TYPE, 1) #define MALLOC(x) tmalloc((size_t)(x)) diff --git a/src/misc/stringutil.h b/src/include/ngspice/stringutil.h similarity index 100% rename from src/misc/stringutil.h rename to src/include/ngspice/stringutil.h diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index 92ec78931..e823a4d26 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -19,7 +19,6 @@ libmisc_la_SOURCES = \ printnum.c \ printnum.h \ string.c \ - stringutil.h \ tilde.c \ tilde.h \ misc_time.c \ diff --git a/src/misc/string.c b/src/misc/string.c index 3b7970a30..74e374b62 100644 --- a/src/misc/string.c +++ b/src/misc/string.c @@ -7,7 +7,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. */ #include "ngspice/ngspice.h" -#include "stringutil.h" +#include "ngspice/stringutil.h" #include "ngspice/dstring.h" int diff --git a/src/winmain.c b/src/winmain.c index cf24ff0ee..988d14925 100644 --- a/src/winmain.c +++ b/src/winmain.c @@ -15,7 +15,7 @@ #include // exit codes #include // var. arguments #include // assert macro -#include "misc/stringutil.h" // copy +#include "ngspice/stringutil.h" // copy #include // _read #include diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj index c6f927dd5..e1b46b1d4 100644 --- a/visualc/vngspice.vcproj +++ b/visualc/vngspice.vcproj @@ -2934,7 +2934,7 @@ >