Browse Source

various compiler warnings removed

pre-master-46
h_vogt 18 years ago
parent
commit
75f68291aa
  1. 6
      ChangeLog
  2. 1
      src/include/ngspice.h
  3. 6
      src/main.c
  4. 33
      src/maths/cmaths/cmath2.c
  5. 1
      src/maths/misc/equality.c
  6. 4
      src/spicelib/devices/bsim3soi_dd/b3soiddld.c
  7. 4
      src/spicelib/devices/bsim3soi_fd/b3soifdld.c
  8. 4
      src/spicelib/devices/bsim3soi_pd/b3soipdld.c

6
ChangeLog

@ -1,3 +1,9 @@
2008-11-04 Holger Vogt
* frontend/numparam/xpressn.c: agauss, sinh, cosh tanh, added (source: S. Thiel)
* b3soi*ld.c: _isnan defined for _MSC_VER
* main.c, cmath2.c, xpressn.c: random, srandom defined extern for _MSC_VER
* math/misc/equality.c: llabs defined extern
2008-11-23 Lionel Sainte Cluque
* COPYING: update many details and tclspice LGPLv2
* src/tclspice.c: changed headers for LGPLv2

1
src/include/ngspice.h

@ -147,6 +147,7 @@ struct timeb timebegin;
#define isnan _isnan
#define finite _finite
#define scalb _scalb
#define getpid _getpid
#endif
#ifndef HAVE_RANDOM

6
src/main.c

@ -15,6 +15,12 @@
#undef AND /* obsolete macro in ansidecl.h */
#endif
/* MINGW: random, srandom in libiberty.a, but not in libiberty.h */
#if defined(__MINGW32__) && defined(HAVE_RANDOM)
extern long int random (void);
extern void srandom (unsigned int seed);
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif /* HAVE_STRING_H */

33
src/maths/cmaths/cmath2.c

@ -23,6 +23,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
#include "cmath.h"
#include "cmath2.h"
/* MINGW: random, srandom in libiberty.a, but not in libiberty.h */
#if defined(__MINGW32__) && defined(HAVE_RANDOM)
extern long int random (void);
extern void srandom (unsigned int seed);
#endif
static double *
d_tan(double *dd, int length)
{
@ -212,8 +219,8 @@ cx_rnd(void *data, short int type, int length, int *newlength, short int *newtyp
for (i = 0; i < length; i++) {
int j, k;
j = floor(realpart(&cc[i]));
k = floor(imagpart(&cc[i]));
j = (int)floor(realpart(&cc[i]));
k = (int)floor(imagpart(&cc[i]));
realpart(&c[i]) = j ? random() % j : 0;
imagpart(&c[i]) = k ? random() % k : 0;
}
@ -228,7 +235,7 @@ cx_rnd(void *data, short int type, int length, int *newlength, short int *newtyp
for (i = 0; i < length; i++) {
int j;
j = floor(dd[i]);
j = (int)floor(dd[i]);
d[i] = j ? random() % j : 0;
}
return ((void *) d);
@ -297,9 +304,9 @@ cx_vector(void *data, short int type, int length, int *newlength, short int *new
double *d;
if (type == VF_REAL)
len = FTEcabs(*dd);
len = (int)FTEcabs(*dd);
else
len = cmag(cc);
len = (int)cmag(cc);
if (len == 0)
len = 1;
d = alloc_d(len);
@ -322,9 +329,9 @@ cx_unitvec(void *data, short int type, int length, int *newlength, short int *ne
double *d;
if (type == VF_REAL)
len = FTEcabs(*dd);
len = (int)FTEcabs(*dd);
else
len = cmag(cc);
len = (int)cmag(cc);
if (len == 0)
len = 1;
d = alloc_d(len);
@ -479,9 +486,9 @@ cx_mod(void *data1, void *data2, short int datatype1, short int datatype2, int l
if ((datatype1 == VF_REAL) && (datatype2 == VF_REAL)) {
d = alloc_d(length);
for (i = 0; i < length; i++) {
r1 = floor(FTEcabs(dd1[i]));
r1 = (int)floor(FTEcabs(dd1[i]));
rcheck(r1 > 0, "mod");
r2 = floor(FTEcabs(dd2[i]));
r2 = (int)floor(FTEcabs(dd2[i]));
rcheck(r2 > 0, "mod");
r3 = r1 % r2;
d[i] = (double) r3;
@ -504,13 +511,13 @@ cx_mod(void *data1, void *data2, short int datatype1, short int datatype2, int l
realpart(&c2) = realpart(&cc2[i]);
imagpart(&c2) = imagpart(&cc2[i]);
}
r1 = floor(FTEcabs(realpart(&c1)));
r1 = (int)floor(FTEcabs(realpart(&c1)));
rcheck(r1 > 0, "mod");
r2 = floor(FTEcabs(realpart(&c2)));
r2 = (int)floor(FTEcabs(realpart(&c2)));
rcheck(r2 > 0, "mod");
i1 = floor(FTEcabs(imagpart(&c1)));
i1 = (int)floor(FTEcabs(imagpart(&c1)));
rcheck(i1 > 0, "mod");
i2 = floor(FTEcabs(imagpart(&c2)));
i2 = (int)floor(FTEcabs(imagpart(&c2)));
rcheck(i2 > 0, "mod");
r3 = r1 % r2;
i3 = i1 % i2;

1
src/maths/misc/equality.c

@ -8,6 +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);
typedef long long long64;
#endif

4
src/spicelib/devices/bsim3soi_dd/b3soiddld.c

@ -21,6 +21,10 @@ File: b3soiddld.c 98/5/01
#include "devdefs.h"
#include "suffix.h"
#ifdef _MSC_VER
extern int _isnan(double);
#endif
#define MAX_EXP 5.834617425e14
#define MIN_EXP 1.713908431e-15
#define EXP_THRESHOLD 34.0

4
src/spicelib/devices/bsim3soi_fd/b3soifdld.c

@ -21,6 +21,10 @@ File: b3soifdld.c 98/5/01
#include "devdefs.h"
#include "suffix.h"
#ifdef _MSC_VER
extern int _isnan(double);
#endif
#define MAX_EXP 5.834617425e14
#define MIN_EXP 1.713908431e-15
#define EXP_THRESHOLD 34.0

4
src/spicelib/devices/bsim3soi_pd/b3soipdld.c

@ -26,6 +26,10 @@ Modified by Paolo Nenzi 2002
#include "devdefs.h"
#include "suffix.h"
#ifdef _MSC_VER
extern int _isnan(double);
#endif
#define EPSOX 3.453133e-11
#define EPSSI 1.03594e-10
#define Charge_q 1.60219e-19

Loading…
Cancel
Save