--- a/ExternalStream.st	Wed Jul 06 13:54:12 2005 +0200
+++ b/ExternalStream.st	Thu Jul 07 17:01:53 2005 +0200
@@ -59,7 +59,7 @@
 # define SEEK_END 2
 #endif
 
-#if defined(__VMS__) || defined(sparc) || defined(WIN32)
+#if defined(__VMS__) || defined(__sparc__) || defined(WIN32)
 # define CLEAR_ERRNO            __threadErrno = 0;
 #else
 # define CLEAR_ERRNO            /* nothing */
@@ -87,7 +87,7 @@
 
 #endif
 
-# ifdef i386
+# ifdef __i386__
 #  define _X86_
 # endif
 
@@ -3444,7 +3444,7 @@
 		__INST(position) = nil; /* i.e. do not know */
 	    }
 	    if (msbFlag == true) {
-#if defined(__MSBFIRST)
+#if defined(__MSBFIRST__)
 		value = u.intVal;
 #else
 		value = (u.buffer[0] & 0xFF);
@@ -3453,7 +3453,7 @@
 		value = (value << 8) | (u.buffer[3] & 0xFF);
 #endif
 	    } else {
-#if defined(__LSBFIRST)
+#if defined(__LSBFIRST__)
 		value = u.intVal;
 #else
 		value = (u.buffer[3] & 0xFF);
@@ -3462,7 +3462,7 @@
 		value = (value << 8) | (u.buffer[0] & 0xFF);
 #endif
 	    }
-#ifdef alpha64
+#if __POINTER_SIZE__ == 8
 	    RETURN ( __MKSMALLINT(value));
 #else
 	    if ((value >= _MIN_INT) && (value <= _MAX_INT)) {
@@ -3525,13 +3525,13 @@
 		__INST(position) = nil; /* i.e. do not know */
 	    }
 	    if (msbFlag == true) {
-#if defined(__MSBFIRST)
+#if defined(__MSBFIRST__)
 		value = u.shortVal;
 #else
 		value = ((u.buffer[0] & 0xFF) << 8) | (u.buffer[1] & 0xFF);
 #endif
 	    } else {
-#if defined(__LSBFIRST)
+#if defined(__LSBFIRST__)
 		value = u.shortVal;
 #else
 		value = ((u.buffer[1] & 0xFF) << 8) | (u.buffer[0] & 0xFF);
@@ -3594,7 +3594,7 @@
 		__INST(position) = nil; /* i.e. do not know */
 	    }
 	    if (msbFlag == true) {
-#if defined(__MSBFIRST)
+#if defined(__MSBFIRST__)
 		value = u.intVal;
 #else
 		value = u.buffer[0];
@@ -3603,7 +3603,7 @@
 		value = (value << 8) | u.buffer[3];
 #endif
 	    } else {
-#if defined(__LSBFIRST)
+#if defined(__LSBFIRST__)
 		value = u.intVal;
 #else
 		value = u.buffer[3];
@@ -3612,7 +3612,7 @@
 		value = (value << 8) | u.buffer[0];
 #endif
 	    }
-#ifdef alpha64
+#if __POINTER_SIZE__ == 8
 	    value &= 0xFFFFFFFF;
 	    RETURN (__MKSMALLINT(value));
 #else
@@ -3676,13 +3676,13 @@
 		__INST(position) = nil; /* i.e. do not know */
 	    }
 	    if (msbFlag == true) {
-#if defined(__MSBFIRST)
+#if defined(__MSBFIRST__)
 		value = u.shortVal;
 #else
 		value = (u.buffer[0] << 8) | u.buffer[1];
 #endif
 	    } else {
-#if defined(__LSBFIRST)
+#if defined(__LSBFIRST__)
 		value = u.shortVal;
 #else
 		value = (u.buffer[1] << 8) | u.buffer[0];
@@ -3893,7 +3893,7 @@
     if (__isSmallInteger(aNumber)) {
 	num = __intVal(aNumber);
     } else {
-#ifdef alpha64
+#if __POINTER_SIZE__ == 8
 	goto badArg;
 #else
 	num = __longIntVal(aNumber);
@@ -3913,7 +3913,7 @@
      && (__INST(mode) != @symbol(readonly))
     ) {
 	if (msbFlag == true) {
-#if defined(__MSBFIRST)
+#if defined(__MSBFIRST__)
 	    u.intVal = num;
 #else
 	    u.bytes[0] = (num >> 24) & 0xFF;
@@ -3922,7 +3922,7 @@
 	    u.bytes[3] = num & 0xFF;
 #endif
 	} else {
-#if defined(__LSBFIRST)
+#if defined(__LSBFIRST__)
 	    u.intVal = num;
 #else
 	    u.bytes[3] = (num >> 24) & 0xFF;
@@ -3988,14 +3988,14 @@
     ) {
 	num = __intVal(aNumber);
 	if (msbFlag == true) {
-#if defined(__MSBFIRST)
+#if defined(__MSBFIRST__)
 	    u.shortVal = num;
 #else
 	    u.bytes[0] = (num >> 8) & 0xFF;
 	    u.bytes[1] = num & 0xFF;
 #endif
 	} else {
-#if defined(__LSBFIRST)
+#if defined(__LSBFIRST__)
 	    u.shortVal = num;
 #else
 	    u.bytes[1] = (num >> 8) & 0xFF;
@@ -5937,7 +5937,7 @@
 !ExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.290 2005-05-31 18:48:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.291 2005-07-07 15:01:51 cg Exp $'
 ! !
 
 ExternalStream initialize!