r260: MSVC changes

diff --git a/getopt/getopt.h b/getopt/getopt.h
index 95ba4e184455665a6aaa6dc6543dc45d9df4bf28..6d73e9fd38a4472534d44311b4be134b1d863666 100644 (file)
--- a/getopt/getopt.h
+++ b/getopt/getopt.h
@@ -82,7 +82,7 @@ extern int optopt;
 
 struct option
 {
-# if defined __STDC__ && __STDC__
+# if defined __STDC__
   const char *name;
 # else
   char *name;

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 93a0a7100e5c6034f1a3a7fc855021ac4a305209..d07eb2b3bb5ffd5e0a3a2ca60b64f290bfc133ef 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.14 2000/12/16 03:29:02 kevin Exp $
+**  $Id: ctsim.cpp,v 1.15 2000/12/16 03:39:06 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -50,10 +50,14 @@
 #include "config.h"
 #endif
 #if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
-#include "getopt.h"
+#ifdef MSVC\r
+#define __STDC__ 1\r
+#include "getopt.h"\r
+#undef __STDC__\r
+#endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.14 2000/12/16 03:29:02 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.15 2000/12/16 03:39:06 kevin Exp $";
 
 class CTSimApp* theApp = NULL;
 

diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp
index f6e2182409ad775f9074d3e45986c33b31b3fb3f..4729ee9c3930aad1542da8bf967d841a04e7d77b 100644 (file)
--- a/src/dlgreconstruct.cpp
+++ b/src/dlgreconstruct.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: dlgreconstruct.cpp,v 1.6 2000/12/16 03:29:02 kevin Exp $
+**  $Id: dlgreconstruct.cpp,v 1.7 2000/12/16 03:39:06 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -36,7 +36,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/button.h"
@@ -48,7 +47,6 @@
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/image.h"
-#endif
 
 #include "dlgreconstruct.h"
 #include <algorithm>