From b7d969a472540853a7fb0d950ddf1b853c35791d Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Thu, 25 Nov 2010 19:39:09 +0000
Subject: [PATCH] drop -D CM_WINDOWS and -D CM_LINUX

---
 ChangeLog                  | 5 +++++
 src/xspice/icm/dlmain.c    | 9 +++------
 src/xspice/icm/makedefs.in | 8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a5ae3080..7e6421a94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-25  Robert Larice
+ * src/xspice/icm/dlmain.c ,
+ * src/xspice/icm/makedefs.in :
+    drop -D CM_WINDOWS and -D CM_LINUX
+
 2010-11-23  Robert Larice
  * src/xspice/icm/xtraevt/int/udnfunc.c ,
  * src/xspice/icm/xtraevt/real/udnfunc.c :
diff --git a/src/xspice/icm/dlmain.c b/src/xspice/icm/dlmain.c
index 1234d8f18..e834c6759 100644
--- a/src/xspice/icm/dlmain.c
+++ b/src/xspice/icm/dlmain.c
@@ -40,13 +40,10 @@ struct coreInfo_t *coreitf;
 //////////////////////////////////////////////////////////////////////////////
 // Functions that return pointers to structures.
 //////////////////////////////////////////////////////////////////////////////
-#ifdef CM_WINDOWS
-#undef CM_EXPORT
-#define CM_EXPORT __declspec(dllexport)
-#endif
 
-#ifdef CM_LINUX
-#undef CM_EXPORT
+#if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER)
+#define CM_EXPORT __declspec(dllexport)
+#else
 #define CM_EXPORT
 #endif
 
diff --git a/src/xspice/icm/makedefs.in b/src/xspice/icm/makedefs.in
index c1bfbd69d..b499183c2 100644
--- a/src/xspice/icm/makedefs.in
+++ b/src/xspice/icm/makedefs.in
@@ -17,20 +17,20 @@ CC = @CC@
 INCLUDES = -I$(TOPDIR)$(top_srcdir)/src/include -I$(TOPDIR)$(top_builddir)
 
 # CFLAGS to use here
-CFLAGS = @CFLAGS@ -fPIC -DCM_LINUX
+CFLAGS = @CFLAGS@ -fPIC
 DEPFLAGS = -MD -MF
 ISMINGW = $(shell uname | grep -c "MINGW32")
 ifeq ($(ISMINGW), 1)
-  CFLAGS = @CFLAGS@ -DCM_WINDOWS
+  CFLAGS = @CFLAGS@
 endif
 ISCYGWIN = $(shell uname | grep -c "CYGWIN")
 ifeq ($(ISCYGWIN), 1)
-  CFLAGS = @CFLAGS@ -DCM_WINDOWS
+  CFLAGS = @CFLAGS@
 endif
 ISSUNOS = $(shell uname | grep -c "SunOS")
 ifeq ($(ISSUNOS), 1)
   ifneq "$(CC)" "gcc"
-    CFLAGS = @CFLAGS@ -KPIC -DCM_LINUX
+    CFLAGS = @CFLAGS@ -KPIC
     DEPFLAGS = -xMD -xMF
   endif
 endif