drop -D CM_WINDOWS and -D CM_LINUX

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 :

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
 

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