diff --git a/src/frontend/resource.c b/src/frontend/resource.c index 7c511f143..60cd0d620 100644 --- a/src/frontend/resource.c +++ b/src/frontend/resource.c @@ -42,14 +42,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #define WIN32_LEAN_AND_MEAN -/* - * The ngspice.h file included above defines bool (via bool.h) and this - * clashes with the definition obtained from windows.h (via winnt.h). - * However, bool is not used by this file so we can work round this problem - * by undefining bool before including windows.h - * SJB - April 2005 - */ - #include #include diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c index fc4d0610a..f2b33c642 100644 --- a/src/frontend/wdisp/windisp.c +++ b/src/frontend/wdisp/windisp.c @@ -20,14 +20,6 @@ #include "../plotting/graphdb.h" #include "windisp.h" -/* - * The ngspice.h file included above defines bool (via bool.h) and this - * clashes with the definition obtained from windows.h (via winnt.h). - * However, bool is not used by this file so we can work round this problem - * by undefining bool before including windows.h - * SJB - May 2005 - */ - #define STRICT #include #include diff --git a/src/frontend/wdisp/winprint.c b/src/frontend/wdisp/winprint.c index 38fad083a..3afbbe6b5 100644 --- a/src/frontend/wdisp/winprint.c +++ b/src/frontend/wdisp/winprint.c @@ -13,14 +13,6 @@ #include "ngspice/ftedbgra.h" #include "ngspice/fteext.h" -/* - * The ngspice.h file included above defines bool (via bool.h) and this - * clashes with the definition obtained from windows.h (via winnt.h). - * However, bool is not used by this file so we can work round this problem - * by undefining bool before including windows.h - * SJB - May 2005 - */ - #define STRICT #include #include diff --git a/src/misc/misc_time.c b/src/misc/misc_time.c index d138f0f6c..945de732f 100644 --- a/src/misc/misc_time.c +++ b/src/misc/misc_time.c @@ -11,13 +11,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. #if defined(HAS_WINGUI) || defined(__MINGW32__) || defined(_MSC_VER) #define WIN32_LEAN_AND_MEAN - /* - * The ngspice.h file included above defines bool (via bool.h) and this - * clashes with the definition obtained from windows.h (via winnt.h). - * However, bool is not used by this file so we can work round this problem - * by undefining bool before including windows.h - * SJB - April 2005 - */ + #include #ifndef HAVE_GETTIMEOFDAY #include