Added some tentative wxMotif clipboard code; did some file formatting

[wxWidgets.git] / src / msw / utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 6cf42a49ca8c68322e7e68581306c6b3caf99932..877a9b4aca72e1ce1e9df589a1ffbbccbd96a388 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -391,7 +391,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
   if (majorVsn) *majorVsn = 0;
   if (minorVsn) *minorVsn = 0;
 
-#ifdef WIN32
+#if defined(__WIN32__) && !defined(__SC__)
   OSVERSIONINFO info;
   memset(&info, 0, sizeof(OSVERSIONINFO));
   info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@@ -415,7 +415,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
   return wxWINDOWS; // error if we get here, return generic value
 #else
   // Win16 code...
-  int retValue ;
+  int retValue = 0;
 #  ifdef __WINDOWS_386__
   retValue = wxWIN386;
 #  else