Browse Source

Fixed problem of duplicated define of BOOL when compiled with MinGW

pre-master-46
sjborley 21 years ago
parent
commit
c9120c1d8c
  1. 10
      src/frontend/wdisp/windisp.c
  2. 10
      src/frontend/wdisp/winprint.c

10
src/frontend/wdisp/windisp.c

@ -12,6 +12,16 @@
#include "graph.h"
#include "ftedev.h"
#include "ftedbgra.h"
/*
* The ngspice.h file included above defines BOOLEAN (via bool.h) and this
* clashes with the definition obtained from windows.h (via winnt.h).
* However, BOOLEAN is not used by this file so we can work round this problem
* by undefining BOOLEAN before including windows.h
* SJB - May 2005
*/
#undef BOOLEAN
#pragma warn -dup // wegen Redefinition von NUMCOLORS
#include <windows.h>
#include <windowsx.h>

10
src/frontend/wdisp/winprint.c

@ -12,6 +12,16 @@
#include "graph.h"
#include "ftedev.h"
#include "ftedbgra.h"
/*
* The ngspice.h file included above defines BOOLEAN (via bool.h) and this
* clashes with the definition obtained from windows.h (via winnt.h).
* However, BOOLEAN is not used by this file so we can work round this problem
* by undefining BOOLEAN before including windows.h
* SJB - May 2005
*/
#undef BOOLEAN
#pragma warn -dup
#include <windows.h>
#include <windowsx.h>

Loading…
Cancel
Save