--- a/ShortFloat.st	Tue May 17 00:56:14 2016 +0200
+++ b/ShortFloat.st	Tue May 17 02:04:25 2016 +0200
@@ -45,29 +45,29 @@
  extern errno;
 #endif
 
-#if !defined (WIN32)
+#if !defined (__win32__)
 # include <locale.h>
 #endif
 
-#if defined (_AIX)
+#if defined (__aix__)
 # include <float.h>
 #endif
 
-#if defined(IRIX)
+#if defined(__irix__)
 # include <nan.h>
 #endif
 
-#if defined(LINUX)
+#if defined(__linux__)
 # ifndef NAN
 #  include <bits/nan.h>
 # endif
 #endif
 
-#if defined(solaris) || defined(sunos)
+#if defined(__solaris__) || defined(__sunos__)
 # include <nan.h>
 #endif
 
-#ifdef WIN32
+#ifdef __win32__
 /*
  * no finite(x) ?
  * no isnan(x) ?
@@ -136,15 +136,15 @@
 #  include <string.h>
 # endif
 
-#endif /* WIN32 */
+#endif /* __win32__ */
 
-#ifdef solaris
+#ifdef __solaris__
 # ifndef isfinite
 #  define isfinite(f) finite((double)(f))
 # endif
 #endif
 
-#ifdef realIX
+#ifdef __realIX__
 # ifndef isfinite
 #  define isfinite(x)     1
 # endif
@@ -408,14 +408,14 @@
     self isIEEEFormat ifFalse:[self error:'unsupported operation'].
 
     (UninterpretedBytes isBigEndian == msb) ifFalse:[
-        "swap the bytes"
-        4 to:1 by:-1 do:[:i |
-            aBasicNewShortFloat basicAt:i put:(aStream next)
-        ].
-        ^ self
+	"swap the bytes"
+	4 to:1 by:-1 do:[:i |
+	    aBasicNewShortFloat basicAt:i put:(aStream next)
+	].
+	^ self
     ].
     1 to:4 do:[:i |
-        aBasicNewShortFloat basicAt:i put:aStream next
+	aBasicNewShortFloat basicAt:i put:aStream next
     ]
 
     "not part of libboss, as this is also used by others (TIFFReader)"
@@ -866,7 +866,7 @@
     float fVal;
 
     fVal = __shortFloatVal(self);
-#ifdef WIN32
+#ifdef __win32__
     if (! isnanf(fVal))
 #endif
     {