diff --git a/ChangeLog b/ChangeLog index a13bd81ae..dc6106314 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-12-30 Holger Vogt + * aspice.c, inpcom.c, numparam/general.h, 1-f-code.h, equality.c + randnumb.c, spdefs.h, cktsens.c: remove compiler warnings + 2010-12-28 Holger Vogt * xpressn.c, cmath2.c, cmath2.h, randnumb.c, parse.c, examples/Monte_Carlo/MonteCarlo.sp: diff --git a/src/frontend/aspice.c b/src/frontend/aspice.c index e2e3c618d..6a05e5d58 100644 --- a/src/frontend/aspice.c +++ b/src/frontend/aspice.c @@ -431,7 +431,7 @@ com_jobs( } void -ft_checkkids( ) +ft_checkkids(void) { return; } diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index ac71a3303..fd6e0adca 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -4040,7 +4040,7 @@ static void inp_compat(struct line *deck) cut_line = str_ptr; // generate node out_ptr = TMALLOC(char, 6); - sprintf(out_ptr, "pa_%02d", pai); + sprintf(out_ptr, "pa_%02d", (int)pai); // Bout_ptr out_ptr 0 V = v(expr_ptr) xlen = 2*strlen(out_ptr) + strlen(exp_ptr )+ 15 - 2*3 + 1; ckt_array[pai] = TMALLOC(char, xlen); @@ -4071,7 +4071,7 @@ static void inp_compat(struct line *deck) exp_ptr = copy_substring(beg_ptr, end_ptr-3); // generate node out_ptr = TMALLOC(char, 6); - sprintf(out_ptr, "pa_%02d", pai); + sprintf(out_ptr, "pa_%02d", (int)pai); // Bout_ptr out_ptr 0 V = v(expr_ptr) xlen = 2*strlen(out_ptr) + strlen(exp_ptr )+ 15 - 2*3 + 1; ckt_array[pai] = TMALLOC(char, xlen); @@ -4157,7 +4157,7 @@ static void inp_compat(struct line *deck) cut_line = str_ptr; // generate node out_ptr = TMALLOC(char, 6); - sprintf(out_ptr, "pa_%02d", pai); + sprintf(out_ptr, "pa_%02d", (int)pai); // Bout_ptr out_ptr 0 V = v(expr_ptr) xlen = 2*strlen(out_ptr) + strlen(exp_ptr )+ 15 - 2*3 + 1; ckt_array[pai] = TMALLOC(char, xlen); diff --git a/src/frontend/numparam/general.h b/src/frontend/numparam/general.h index 9f87c59ea..5b40e45ad 100644 --- a/src/frontend/numparam/general.h +++ b/src/frontend/numparam/general.h @@ -50,6 +50,7 @@ void strif(long n, int f, SPICE_DSTRINGPTR dstr_p); void strf(double x, int a, int b, SPICE_DSTRINGPTR dstr_p); /* float -> string */ long ival(char * s, int *err); double rval(char * s, int *err); +int posi (char *sub, char *s, int opt); char upcase(char c); char lowcase(char c); diff --git a/src/include/1-f-code.h b/src/include/1-f-code.h index 39ec28443..b55f660ee 100644 --- a/src/include/1-f-code.h +++ b/src/include/1-f-code.h @@ -44,7 +44,7 @@ trnoise_state_get(struct trnoise_state *this, CKTcircuit *ckt, size_t index) if(index + TRNOISE_STATE_MEM_LEN < this->top) { fprintf(stderr, "ouch, trying to fetch from the past %d %d\n", - index, this->top); + (int)index, (int)this->top); exit(1); } diff --git a/src/maths/misc/equality.c b/src/maths/misc/equality.c index cfef9b067..b9ae43f85 100644 --- a/src/maths/misc/equality.c +++ b/src/maths/misc/equality.c @@ -8,7 +8,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. #ifdef _MSC_VER typedef __int64 long64; #else -extern long long llabs(long long); +//extern long long llabs(long long); typedef long long long64; #endif diff --git a/src/maths/misc/randnumb.c b/src/maths/misc/randnumb.c index 96a483b8e..281fbc9fd 100644 --- a/src/maths/misc/randnumb.c +++ b/src/maths/misc/randnumb.c @@ -70,6 +70,7 @@ double exprand(double); void checkseed(void); double drand(void); double gauss0(void); +void rgauss(double* py1, double* py2); int poisson(double); diff --git a/src/maths/sparse/spdefs.h b/src/maths/sparse/spdefs.h index 0224ed63f..657f3d3e9 100644 --- a/src/maths/sparse/spdefs.h +++ b/src/maths/sparse/spdefs.h @@ -798,5 +798,7 @@ extern void spcLinkRows( MatrixPtr ); extern void spcColExchange( MatrixPtr, int, int ); extern void spcRowExchange( MatrixPtr, int, int ); +void spErrorMessage(MatrixPtr, FILE *, char *); + #endif diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index 9d5e7a76d..7fa839b18 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -605,7 +605,7 @@ inc_freq(double freq, int type, double step_size) return freq; } - +/* static double next_freq(int type, double freq, double stepsize) { @@ -627,7 +627,7 @@ next_freq(int type, double freq, double stepsize) } return s; } - +*/ int count_steps(int type, double low, double high, int steps, double *stepsize) {