Browse Source

set the proper preprocessor flag __MINGW32__

pre-master-46
Holger Vogt 6 years ago
parent
commit
1398ee7aa0
  1. 2
      src/frontend/plotting/gnuplot.c
  2. 2
      src/include/ngspice/ngspice.h
  3. 2
      src/misc/util.c

2
src/frontend/plotting/gnuplot.c

@ -161,7 +161,7 @@ void ft_gnuplot(double *xlims, double *ylims,
} }
/* Set up the file header. */ /* Set up the file header. */
#if !defined(__MINGW__) && !defined(_MSC_VER) && !defined(__CYGWIN__)
#if !defined(__MINGW32__) && !defined(_MSC_VER) && !defined(__CYGWIN__)
fprintf(file, "set terminal X11 noenhanced\n"); fprintf(file, "set terminal X11 noenhanced\n");
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
#ifndef EXT_ASC #ifndef EXT_ASC

2
src/include/ngspice/ngspice.h

@ -219,7 +219,7 @@ extern double x_atanh(double);
#endif #endif
#ifndef EXT_ASC #ifndef EXT_ASC
#if defined(__MINGW__) || defined(_MSC_VER)
#if defined(__MINGW32__) || defined(_MSC_VER)
#define fopen newfopen #define fopen newfopen
extern FILE *newfopen(const char *fn, const char* md); extern FILE *newfopen(const char *fn, const char* md);
#endif #endif

2
src/misc/util.c

@ -260,7 +260,7 @@ ngdirname(const char *name)
/* Replacement for fopen, when using wide chars (utf-16) */ /* Replacement for fopen, when using wide chars (utf-16) */
#ifndef EXT_ASC #ifndef EXT_ASC
#if defined(__MINGW__) || defined(_MSC_VER)
#if defined(__MINGW32__) || defined(_MSC_VER)
#undef BOOLEAN #undef BOOLEAN
#include <windows.h> #include <windows.h>
FILE * FILE *

Loading…
Cancel
Save