Some minors changes, like adding empty lines at end of files, to be able to compile...

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

diff --git a/src/common/extended.c b/src/common/extended.c
index ff117982e01fa2246820a974e776d850edf30038..42225997a2e61a73bc91bbb500a3e9fae8ddefe0 100644 (file)
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -1,7 +1,7 @@
 #include "wx/setup.h"
 #include <math.h>
 
-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE
 
 /*
  * C O N V E R T   T O  I E E E   E X T E N D E D
@@ -82,16 +82,25 @@ void ConvertToIeeeExtended(double num, unsigned char *bytes)
                }
        }
 
-       bytes[0] = expon >> 8;
-       bytes[1] = expon;
-       bytes[2] = (unsigned char) hiMant >> 24;
-       bytes[3] = (unsigned char) hiMant >> 16;
-       bytes[4] = (unsigned char) hiMant >> 8;
-       bytes[5] = (unsigned char) hiMant;
-       bytes[6] = (unsigned char) loMant >> 24;
-       bytes[7] = (unsigned char) loMant >> 16;
-       bytes[8] = (unsigned char) loMant >> 8;
-       bytes[9] = (unsigned char) loMant;
+    /* disable the warning about 'possible loss of data' */
+    #ifdef _MSC_VER
+        #pragma warning(disable: 4244)
+    #endif /* Visual C++ */
+
+       bytes[0] = (expon >> 8) & 0xff;
+       bytes[1] = expon & 0xff;
+       bytes[2] = (unsigned char) ((hiMant >> 24) & 0xff);
+       bytes[3] = (unsigned char) ((hiMant >> 16) & 0xff);
+       bytes[4] = (unsigned char) ((hiMant >> 8) & 0xff);
+       bytes[5] = (unsigned char) (hiMant & 0xff);
+       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);
+
+    #ifdef _MSC_VER
+        #pragma warning(default: 4244)
+    #endif /* Visual C++ */
 }
 
 /*
@@ -176,4 +185,4 @@ double ConvertFromIeeeExtended(const unsigned char *bytes)
                return f;
 }
 
-#endif
+#endif /* wxUSE_APPLE_IEEE */