diff --git a/ChangeLog b/ChangeLog index 31d2af3de..b49e5a8ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-15 Robert Larice + * src/include/ngspice.h , + * src/main.c , + * src/misc/misc_time.h : + collect extern timebegin in "misc_time.h" + 2010-10-15 Robert Larice * src/ciderlib/support/globals.c , * src/ciderlib/support/mater.c , diff --git a/src/include/ngspice.h b/src/include/ngspice.h index 09c2ce3da..d3a814b95 100644 --- a/src/include/ngspice.h +++ b/src/include/ngspice.h @@ -124,7 +124,6 @@ # else # ifdef HAVE_FTIME # include -extern struct timeb timebegin; # endif # endif #endif diff --git a/src/main.c b/src/main.c index ddc11b805..6997920dc 100644 --- a/src/main.c +++ b/src/main.c @@ -49,6 +49,7 @@ extern int rl_catch_signals; /* missing from editline/readline.h */ #include "spicelib/devices/dev.h" #include "spicelib/analysis/analysis.h" #include "misc/ivars.h" +#include "misc/misc_time.h" #if defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_H) #include #else @@ -185,12 +186,6 @@ static void append_to_stream(FILE *dest, FILE *source); #endif /* SIMULATOR */ -#ifndef HAVE_GETRUSAGE -#ifdef HAVE_FTIME -extern struct timeb timebegin; /* for use w/ ftime */ -#endif -#endif - extern IFsimulator SIMinfo; #ifdef SIMULATOR diff --git a/src/misc/misc_time.h b/src/misc/misc_time.h index b866ab650..fe0ff4eba 100644 --- a/src/misc/misc_time.h +++ b/src/misc/misc_time.h @@ -13,6 +13,8 @@ double seconds(void); #ifndef HAVE_TIMES #ifdef HAVE_FTIME +extern struct timeb timebegin; + void timediff(struct timeb *, struct timeb *, int *, int *); #endif