changed the #include order - ngspice.h must be first

because icc complains about declaration visibility of mmsghdr struct
14 years ago · 2506fe3858
25 changed files with 11 additions and 65 deletions
--- a/src/frontend/com_hardcopy.c
+++ b/src/frontend/com_hardcopy.c
@ -1,5 +1,4 @@
 #include "ngspice/config.h"
-#include <stdio.h>

 #include "ngspice/ngspice.h"
 #include "ngspice/defines.h"
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@ -21,11 +21,10 @@ Todo:
  add support for nested .if .elsif .else .endif controls.
 */

-#include <stdio.h>
+#include "ngspice/ngspice.h"

 #include "general.h"
 #include "numparam.h"
-#include "ngspice/ngspice.h"

 #include "ngspice/fteext.h" /* controlled_exit() */

--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@ -4,12 +4,10 @@
   Free software under the terms of the GNU Lesser General Public License
 */

-#include <stdio.h>                /* for function message() only. */
-#include <stdarg.h>
+#include "ngspice/ngspice.h"

 #include "general.h"
 #include "numparam.h"
-#include "ngspice/ngspice.h"
 #include "ngspice/cpdefs.h"
 #include "ngspice/ftedefs.h"
 #include "ngspice/dvec.h"
--- a/src/frontend/trannoise/1-f-code.c
+++ b/src/frontend/trannoise/1-f-code.c
@ -7,11 +7,6 @@
 Volume 83,  Issue 5,  May 1995 Page(s):802 - 827
 */

-#include <math.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdarg.h>                     // var. argumente
 #include "ngspice/ngspice.h"
 #include "ngspice/cpextern.h"
 #include "ngspice/cktdefs.h"
--- a/src/frontend/trannoise/FastNorm3.c
+++ b/src/frontend/trannoise/FastNorm3.c
@ -61,10 +61,10 @@ Normal  (a very fast routine)
 */

 /* ----------------- inclusions and some definitions ------------ */
-#include <math.h>
 #ifndef NOSPICE
 #include "ngspice/ngspice.h"
 #endif
+#include <math.h>
 #include "ngspice/FastNorm3.h"


--- a/src/frontend/trannoise/wallace.c
+++ b/src/frontend/trannoise/wallace.c
@ -4,8 +4,13 @@

 //#define FASTNORM_ORIG

-#include <stdio.h>
-#include <stdlib.h>
+#ifdef HasMain
+#include <sys/timeb.h>
+#else
+#ifndef NOSPICE
+#include "ngspice/ngspice.h"
+#endif
+#endif
 #ifdef _MSC_VER
 #include <process.h>
 #define getpid _getpid
@ -16,14 +21,6 @@
 #include "ngspice/wallace.h"
 #include "ngspice/FastNorm3.h"

-#ifdef HasMain
-#include <sys/timeb.h>
-#else
-#ifndef NOSPICE
-#include "ngspice/ngspice.h"
-#endif
-#endif
-
 #define POOLSIZE 4096
 #define LPOOLSIZE 12
 #define NOTRANS 3 /* number of (dual) transformations */
--- a/src/frontend/variable.c
+++ b/src/frontend/variable.c
@ -4,9 +4,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 **********/

 #include "ngspice/config.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>

 #include "ngspice/ngspice.h"
 #include "ngspice/bool.h"
--- a/src/spicelib/devices/hisim2/hsm2acld.c
+++ b/src/spicelib/devices/hisim2/hsm2acld.c
@ -13,7 +13,6 @@
                Semiconductor Technology Academic Research Center (STARC)
 ***********************************************************************/

-#include <stdio.h>
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "ngspice/sperror.h"
--- a/src/spicelib/devices/hisim2/hsm2eval.c
+++ b/src/spicelib/devices/hisim2/hsm2eval.c
@ -130,17 +130,12 @@ using the HiSIM2 standard.
 /*---------------------------------------------------*
 * Header files.
 *-----------------*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <float.h>
+#include "ngspice/ngspice.h"
 #ifdef __STDC__
 /* #include <ieeefp.h> */
 #endif
 #include "ngspice/cktdefs.h"

-#include "ngspice/ngspice.h"
-
 /*-----------------------------------*
 * HiSIM macros
 *-----------------*/
--- a/src/spicelib/devices/hisim2/hsm2ld.c
+++ b/src/spicelib/devices/hisim2/hsm2ld.c
@ -13,7 +13,6 @@
                Semiconductor Technology Academic Research Center (STARC)
 ***********************************************************************/

-#include <stdio.h>
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 #include "hsm2def.h"
--- a/src/spicelib/parser/inppas1.c
+++ b/src/spicelib/parser/inppas1.c
@ -3,8 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/

-#include <stdio.h>
-
 #include "ngspice/config.h"
 #include "ngspice/ngspice.h"

--- a/src/xspice/evt/evtbackup.c
+++ b/src/xspice/evt/evtbackup.c
@ -40,7 +40,6 @@ NON-STANDARD FEATURES


 /*=== INCLUDE FILES ===*/
-#include <stdio.h>
 #include "ngspice/ngspice.h"

 #include "ngspice/cktdefs.h"
--- a/src/xspice/evt/evtdeque.c
+++ b/src/xspice/evt/evtdeque.c
@ -38,8 +38,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-
 #include "ngspice/ngspice.h"

 #include "ngspice/cktdefs.h"
--- a/src/xspice/evt/evtdump.c
+++ b/src/xspice/evt/evtdump.c
@ -39,9 +39,6 @@ NON-STANDARD FEATURES
 ============================================================================*/


-#include <stdio.h>
-#include <string.h>
-
 #include "ngspice/ngspice.h"
 //#include "misc.h"

--- a/src/xspice/evt/evtinit.c
+++ b/src/xspice/evt/evtinit.c
@ -40,8 +40,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include  <string.h>
-#include  <stdio.h>
 #include "ngspice/ngspice.h"
 #include  "ngspice/cktdefs.h"
 //#include  "util.h"
--- a/src/xspice/evt/evtiter.c
+++ b/src/xspice/evt/evtiter.c
@ -38,9 +38,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-#include <string.h>
-
 #include "ngspice/ngspice.h"
 //#include "misc.h"
 #include "ngspice/cktdefs.h"
--- a/src/xspice/evt/evtload.c
+++ b/src/xspice/evt/evtload.c
@ -39,8 +39,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 //#include "util.h"
--- a/src/xspice/evt/evtnext_time.c
+++ b/src/xspice/evt/evtnext_time.c
@ -38,8 +38,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 //#include "util.h"
--- a/src/xspice/evt/evtop.c
+++ b/src/xspice/evt/evtop.c
@ -40,7 +40,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 //#include "util.h"
--- a/src/xspice/evt/evtplot.c
+++ b/src/xspice/evt/evtplot.c
@ -37,9 +37,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-#include <string.h>
-
 #include "ngspice/ngspice.h"
 //nclude "misc.h"
 #include "ngspice/evt.h"
--- a/src/xspice/evt/evtprint.c
+++ b/src/xspice/evt/evtprint.c
@ -39,9 +39,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-#include <string.h>
-
 #include "ngspice/ngspice.h"

 #include "ngspice/cpstd.h"
--- a/src/xspice/evt/evtqueue.c
+++ b/src/xspice/evt/evtqueue.c
@ -50,8 +50,6 @@ NON-STANDARD FEATURES
 ============================================================================*/


-#include <stdio.h>
-
 #include "ngspice/ngspice.h"
 #include "ngspice/cktdefs.h"
 //#include "util.h"
--- a/src/xspice/evt/evtsetup.c
+++ b/src/xspice/evt/evtsetup.c
@ -40,9 +40,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-#include <string.h>
-
 #include "ngspice/ngspice.h"
 //#include "misc.h"

--- a/src/xspice/evt/evttermi.c
+++ b/src/xspice/evt/evttermi.c
@ -49,8 +49,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
-
 #include "ngspice/ngspice.h"
 //#include "misc.h"

--- a/src/xspice/mif/mifdelete.c
+++ b/src/xspice/mif/mifdelete.c
@ -38,7 +38,6 @@ NON-STANDARD FEATURES

 ============================================================================*/

-#include <stdio.h>
 #include "ngspice/ngspice.h"
 #include "ngspice/sperror.h"
 #include "ngspice/gendefs.h"