Macro swicth from SC to SYMANTEC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 2c0cacf0680a86065b00c7356ce3f54590c1bbc2..9fb223cde23f186ef2843218402a5be0e9850b17 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -41,7 +41,7 @@
     typedef _off_t off_t;
 #elif defined(__BORLANDC__) && defined(__WIN16__)
     typedef long off_t;
-#elif defined(__SC__)
+#elif defined(__SYMANTEC__)
     typedef long off_t;
 #elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)
     typedef long off_t;

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 45718f159f086bb94929f848015fe489976bb96e..33dc2cce0ade32222e187b8fc1bb71edca1a4006 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -56,7 +56,7 @@
         #include <commdlg.h>
     #endif // Win16
 
-    #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
+    #if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>
     #endif

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index e91969f481261650ed19e4a1c22e42740b548793..0cee8d945562859ae380a093be7e64d4fed7de75 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -71,7 +71,7 @@
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation..., but some
 // compilers don't support it (missing headers, libs, ...)
-#if defined(__GNUWIN32_OLD__) || defined(__SC__) || defined(__SALFORDC__)
+#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index d47642669e7f10af7ea8455c290d45965bfda00d..0dc3e686f850d5d6830e1be0c43e7f30cdb4d1c9 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -188,7 +188,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 // get drawn embossed? How can we tell DrawState that we don't want the
 // embossing?
 
-#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
+#if defined(__WIN32__) && !defined(__SYMANTEC__) && !defined(__TWIN32__)
 #define   O_DRAW_NATIVE_API     // comments below explain why I use it
 #endif
 

diff --git a/src/tiff/tif_apple.c b/src/tiff/tif_apple.c
index 83f47bae9756a05a559c2f14e6ca34914c0a210c..d691eb2edb7f4dc2fe73facb3c1f30ab9bfc4d77 100644 (file)
--- a/src/tiff/tif_apple.c
+++ b/src/tiff/tif_apple.c
@@ -53,7 +53,7 @@
 #include <Files.h>
 #include <Memory.h>
 
-#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__) || defined(applec)
+#if defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__) || defined(applec)
 #define        CtoPstr c2pstr
 #endif