tmake template for DLL project for VC++ 6.0

[wxWidgets.git] / src / common / extended.c

diff --git a/src/common/extended.c b/src/common/extended.c
index 33800605057fc7f7ab4a874c3214540b13ca4baf..c691e6b1a56daae7a2c2b45c8286190f17715e24 100644 (file)
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -1,3 +1,6 @@
+#if !defined(__VISAGECPP__)
+#   pragma warning(disable:4001)    /* non standard extension used: single line comment */
+#endif
 #include "wx/setup.h"
 #include <math.h>
 
@@ -82,9 +85,10 @@ void ConvertToIeeeExtended(double num, unsigned char *bytes)
                }
        }
 
-    /* disable the warning about 'possible loss of data' */
+    /* disable the warning about 'possible loss of data' & 'conversion between diff types' */
     #ifdef _MSC_VER
         #pragma warning(disable: 4244)
+        #pragma warning(disable: 4135)
     #endif /* Visual C++ */
 
        bytes[0] = (expon >> 8) & 0xff;
@@ -96,10 +100,11 @@ void ConvertToIeeeExtended(double num, unsigned char *bytes)
        bytes[6] = (unsigned char) ((loMant >> 24) & 0xff);
        bytes[7] = (unsigned char) ((loMant >> 16) & 0xff);
        bytes[8] = (unsigned char) ((loMant >> 8) & 0xff);
-       bytes[9] = (unsigned char) (loMant & 0xff;
+       bytes[9] = (unsigned char) (loMant & 0xff);
 
     #ifdef _MSC_VER
         #pragma warning(default: 4244)
+        #pragma warning(default: 4135)
     #endif /* Visual C++ */
 }