Merged 036717d61eda and dbcf4ab2af2e (branch default - CVS HEAD) jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 07 Feb 2013 09:53:25 +0100
branchjv
changeset 18026 fa8a879502cb
parent 18025 036717d61eda (current diff)
parent 14762 dbcf4ab2af2e (diff)
child 18027 3621469cc5e8
Merged 036717d61eda and dbcf4ab2af2e (branch default - CVS HEAD)
AbstractOperatingSystem.st
ExternalBytes.st
ExternalFunctionCallback.st
ExternalStream.st
Filename.st
Float.st
NonPositionableExternalStream.st
SmallInteger.st
String.st
UserPreferences.st
Win32OperatingSystem.st
--- a/.hgtags	Tue Feb 05 15:50:13 2013 +0100
+++ b/.hgtags	Thu Feb 07 09:53:25 2013 +0100
@@ -11,7 +11,6 @@
 161b8aaf00eb5bdb0eb73c8f9af31b13763ca6b1 dtm2_1
 2346990ded7bef4768e9b591e4aede0acb30265d expeccoNET_1_6_8_0
 246cb9b21fdca908bbd336a4f95f1b5a94ebb107 expecco_2_4_0
-246cb9b21fdca908bbd336a4f95f1b5a94ebb107 stable
 27b02e64ef6a1e1362856458db1463ea6501496a expeccoNET_1_7_0_0
 29a49feab7992340985b5abfc0348cd9c326693f rel2_10_8_5
 2d6c911e474dad01fe3896267a33d04c1b4ee6b0 rel5_1_4
@@ -28,6 +27,7 @@
 4cfcb1c3d0cc3098ffb5af37a66b5789b3c9e14a stx_513
 6516bfb2ae56ebcb9dee9ca2ccd2acb80a9a1e88 expecco_1_0_3
 66c655c1a7cbe4cff09bf03fd379abed2ee0c539 expecco_1_5_0
+6a70a70060931430d722dd71e3e1d89e5c3d2175 stable
 6dcd44bc2ff92d95c87750dece318217585ea275 expeccoNET_1_4_0rc1
 751f95f1fff0e0772ea359d56aa7be91ad927ddd expecco_2_2_0
 78a0707fdf33e9e7f9e893c868634320e1e413d7 rel2_10_8_6_last_before_vmData_change
--- a/AbstractOperatingSystem.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/AbstractOperatingSystem.st	Thu Feb 07 09:53:25 2013 +0100
@@ -3229,10 +3229,20 @@
 # ifdef WIN32
 #  if defined( __BORLANDC__ )
 #   define CC_DEFINE    "__BORLANDC__"
-#  elif defined( __VISUALC__ )
-#   define CC_DEFINE     "__VISUALC__"
-#  elif defined( __MINGW64__ )
-#   define CC_DEFINE     "__MINGW64__"
+#  else
+#   if defined( __VISUALC__ )
+#    define CC_DEFINE     "__VISUALC__"
+#   else
+#    if defined( __MINGW64__ )
+#     define CC_DEFINE     "__MINGW64__"
+#    else
+#     if defined( __MINGW32__ )
+#      define CC_DEFINE     "__MINGW32__"
+#     else
+#      define CC_DEFINE     "__CC__"
+#     endif
+#    endif
+#   endif
 #  endif
 # else
 #  ifdef __GNUC__
@@ -7159,11 +7169,11 @@
 !AbstractOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.224 2013-01-16 10:30:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.225 2013-02-05 22:12:47 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.224 2013-01-16 10:30:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.225 2013-02-05 22:12:47 cg Exp $'
 ! !
 
 
--- a/ExternalBytes.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/ExternalBytes.st	Thu Feb 07 09:53:25 2013 +0100
@@ -18,6 +18,13 @@
 	category:'System-Support'
 !
 
+!ExternalBytes primitiveDefinitions!
+%{
+#include <stdlib.h>
+#include <stdio.h>
+%}
+! !
+
 !ExternalBytes primitiveFunctions!
 %{
 
@@ -122,7 +129,6 @@
     char *ptr;
 {
 	char *newPtr;
-	char *realloc();
 
 	removeFromMallocList(ptr);
 	newPtr = realloc(ptr, nBytes);
@@ -1310,11 +1316,12 @@
 !ExternalBytes class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalBytes.st,v 1.85 2013-01-08 17:55:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalBytes.st,v 1.87 2013-02-05 15:27:51 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalBytes.st,v 1.85 2013-01-08 17:55:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalBytes.st,v 1.87 2013-02-05 15:27:51 stefan Exp $'
 ! !
 
+
 ExternalBytes initialize!
--- a/ExternalFunctionCallback.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/ExternalFunctionCallback.st	Thu Feb 07 09:53:25 2013 +0100
@@ -13,14 +13,14 @@
 
 ExternalFunction subclass:#ExternalFunctionCallback
 	instanceVariableNames:'returnType argumentTypes flags action'
-	classVariableNames:'CallBackRegistry Verbose'
+	classVariableNames:'CallBackRegistry'
 	poolDictionaries:''
 	category:'System-Support'
 !
 
 !ExternalFunctionCallback primitiveDefinitions!
 %{
-
+#include <stdlib.h>
 #include <stdio.h>
 
 #ifdef HAVE_FFI
@@ -846,9 +846,10 @@
 !ExternalFunctionCallback class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunctionCallback.st,v 1.21 2013-01-16 12:20:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunctionCallback.st,v 1.22 2013-02-05 16:00:13 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunctionCallback.st,v 1.21 2013-01-16 12:20:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalFunctionCallback.st,v 1.22 2013-02-05 16:00:13 stefan Exp $'
 ! !
+
--- a/ExternalStream.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/ExternalStream.st	Thu Feb 07 09:53:25 2013 +0100
@@ -494,7 +494,7 @@
 		    if (__threadErrno == EINTR) {       \
 			clearerr(f);                    \
 			/* refetch */                   \
-			buf = (volatile char *)(obj);   \
+			buf = (char *)(obj);   \
 			continue;                       \
 		    }                                   \
 		} else {                                \
@@ -531,7 +531,7 @@
 	    }                                           \
 	    if( (ret) > 0 ) {                               \
 		/* refetch */                               \
-		buf = (volatile char *)(obj);               \
+		buf = (char *)(obj);               \
 		memcpy((buf)+__ooffs+__offs,__buf,(ret));   \
 		__offs += (ret);                            \
 	    } else {                                        \
@@ -559,7 +559,7 @@
 		    if (__threadErrno == EINTR) {    \
 			clearerr(f);                 \
 			/* refetch */                \
-			buf = (volatile char *)(obj);\
+			buf = (char *)(obj);\
 			continue;                    \
 		    }                                \
 		} else {                             \
@@ -614,7 +614,7 @@
 	    }                                        \
 	    if( (ret) > 0 ) {                               \
 		/* refetch */                               \
-		buf = (volatile char *)(obj);               \
+		buf = (char *)(obj);               \
 		memcpy((buf)+__ooffs+__offs,__buf,(ret));   \
 		__offs += (ret);                            \
 	    } else {                                        \
@@ -706,7 +706,7 @@
 		if (ferror(f)) {                        \
 		    if (__threadErrno == EINTR) {       \
 			/* refetch */                   \
-			buf = (volatile char *)(obj);   \
+			buf = (char *)(obj);   \
 			clearerr(f);                    \
 			continue;                       \
 		    }                                   \
@@ -728,7 +728,7 @@
 	    if ( l > IO_BUFFER_SIZE)                    \
 	      l = IO_BUFFER_SIZE;                       \
 	    /* refetch */                               \
-	    buf = (volatile char *)(obj);               \
+	    buf = (char *)(obj);               \
 	    memcpy(__buf,(buf)+__ooffs+__offs,l);       \
 	    WRITE(ret,f, __buf, l, handleType);                     \
 	    if (ret <= 0) {                             \
@@ -1042,7 +1042,7 @@
 		    if (__cnt < 0 && __threadErrno == EINTR) {  \
 			__HANDLE_INTERRUPTS__;          \
 			/* refetch */                   \
-			buf = (volatile char *)(obj);   \
+			buf = (char *)(obj);   \
 			continue;                       \
 		    }                                   \
 		    break;                              \
@@ -1075,7 +1075,7 @@
 			__HANDLE_INTERRUPTS__;          \
 			clearerr(f);                    \
 			/* refetch */                   \
-			buf = (volatile char *)(obj);   \
+			buf = (char *)(obj);   \
 			DEBUGBUFFER(buf);               \
 			continue;                       \
 		    }                                   \
@@ -1108,7 +1108,7 @@
 		    if (__cnt < 0 && __threadErrno == EINTR) {  \
 			__HANDLE_INTERRUPTS__;          \
 			/* refetch */                   \
-			buf = (volatile char *)(obj);   \
+			buf = (char *)(obj);   \
 			continue;                       \
 		    }                                   \
 		    break;                              \
@@ -1138,7 +1138,7 @@
 		    if (__threadErrno == EINTR) {       \
 			clearerr(f);                    \
 			/* refetch */                   \
-			buf = (volatile char *)(obj);   \
+			buf = (char *)(obj);   \
 			(ret) = 0;                      \
 			break;                          \
 		    }                                   \
@@ -1307,7 +1307,7 @@
 		if (ret < 0 && __threadErrno == EINTR) { \
 		    __HANDLE_INTERRUPTS__;              \
 		    /* refetch */                       \
-		    buf = (volatile char *)(obj);       \
+		    buf = (char *)(obj);       \
 		    continue;                           \
 		}                                       \
 		break;                                  \
@@ -1335,7 +1335,7 @@
 		    if (__threadErrno == EINTR) {       \
 			__HANDLE_INTERRUPTS__;          \
 			/* refetch */                   \
-			buf = (volatile char *)(obj);   \
+			buf = (char *)(obj);   \
 			clearerr(f);                    \
 			continue;                       \
 		    }                                   \
@@ -1356,7 +1356,7 @@
 		if (ret < 0 && __threadErrno == EINTR){ \
 		    __HANDLE_INTERRUPTS__;              \
 		    /* refetch */                       \
-		    buf = (volatile char *)(obj);       \
+		    buf = (char *)(obj);       \
 		    continue;                           \
 		}                                       \
 		break;                                  \
@@ -3079,42 +3079,45 @@
      || (__INST(handleType) == @symbol(filePointer))
      || (__INST(handleType) == @symbol(socketFilePointer))
      || (__INST(handleType) == @symbol(pipeFilePointer))) {
-	OBJ fp;
-	FILEPOINTER f;
-
-	if ((fp = __INST(handle)) != nil) {
-	    f = __FILEVal(fp);
+        OBJ fp;
+        FILEPOINTER f;
+
+        if ((fp = __INST(handle)) != nil) {
+            f = __FILEVal(fp);
 #ifdef WIN32
-	    __threadErrno = 0;
-	    ret = __STX_API_NOINT_CALL1( "FlushFileBuffers", FlushFileBuffers, _get_osfhandle(fileno(f)));
-	    if (ret) {
-		RETURN (self);
-	    }
+            __threadErrno = 0;
+            ret = __STX_API_NOINT_CALL1( "FlushFileBuffers", FlushFileBuffers, _get_osfhandle(fileno(f)));
+            if (ret) {
+                RETURN (self);
+            }
 #else
 
-	    __BEGIN_INTERRUPTABLE__
-	    do {
-		__threadErrno = 0;
-		ret = fdatasync(fileno(f));
-	    } while ((ret < 0) && (__threadErrno == EINTR));
-	    __END_INTERRUPTABLE__
-
-	    if (ret >= 0) {
-		RETURN (self);
-	    }
+            __BEGIN_INTERRUPTABLE__
+            do {
+                __threadErrno = 0;
+                ret = fdatasync(fileno(f));
+            } while ((ret < 0) && (__threadErrno == EINTR));
+            __END_INTERRUPTABLE__
+
+            if (ret >= 0) {
+                RETURN (self);
+            }
 #endif /* ! WIN32 */
-	    __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
-	}
+            __INST(lastErrorNumber) = __mkSmallInteger(__threadErrno);
+        }
     }
 #endif /* ! __openVMS__ */
 %}.
     lastErrorNumber notNil ifTrue:[^ self ioError].
     handle isNil ifTrue:[^ self errorNotOpen].
 
+    "if notdef HAS_DATASYNC, fall back"
+    self sync.
+
     "
-	|f|
-	f := 'x' asFilename writeStream.
-	f nextPutAll:'hallo'; sync; syncData; close
+        |f|
+        f := 'x' asFilename writeStream.
+        f nextPutAll:'hallo'; sync; syncData; close
     "
 !
 
@@ -5728,11 +5731,11 @@
 !ExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.357 2013-01-17 22:37:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.359 2013-02-06 16:02:24 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.357 2013-01-17 22:37:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.359 2013-02-06 16:02:24 stefan Exp $'
 ! !
 
 
--- a/Filename.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/Filename.st	Thu Feb 07 09:53:25 2013 +0100
@@ -2787,7 +2787,7 @@
         ]
     ] ensure:[
         inStream close.
-        outStream notNil ifTrue:[outStream close].
+        outStream notNil ifTrue:[outStream syncData; close].
     ].
 
     "
@@ -5907,11 +5907,11 @@
 !Filename class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.383 2013-01-04 13:38:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.384 2013-02-06 15:57:06 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.383 2013-01-04 13:38:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.384 2013-02-06 15:57:06 stefan Exp $'
 ! !
 
 
--- a/Float.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/Float.st	Thu Feb 07 09:53:25 2013 +0100
@@ -21,6 +21,7 @@
 
 !Float primitiveDefinitions!
 %{
+#include <stdio.h>
 #include <errno.h>
 
 #ifndef __OPTIMIZE__
@@ -1900,17 +1901,12 @@
 
 %{  /* NOCONTEXT */
 
-    double frexp();
     double frac;
     int exp;
 
-    __threadErrno = 0;
     frac = frexp(__floatVal(self), &exp);
-    if (__threadErrno == 0) {
-	RETURN (__mkSmallInteger(exp));
-    }
+    RETURN (__mkSmallInteger(exp));
 %}.
-    ^ self primitiveFailed
 
     "
      1.0 exponent
@@ -1935,17 +1931,12 @@
 
 %{  /* NOCONTEXT */
 
-    double frexp();
     double frac;
     int exp;
 
-    __threadErrno = 0;
     frac = frexp(__floatVal(self), &exp);
-    if (__threadErrno == 0) {
-	RETURN (__MKFLOAT(frac));
-    }
+    RETURN (__MKFLOAT(frac));
 %}.
-    ^ self primitiveFailed
 
     "
      1.0 exponent
@@ -2856,11 +2847,11 @@
 !Float class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.186 2013-01-29 12:27:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.187 2013-02-05 15:29:32 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.186 2013-01-29 12:27:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.187 2013-02-05 15:29:32 stefan Exp $'
 ! !
 
 
--- a/NonPositionableExternalStream.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/NonPositionableExternalStream.st	Thu Feb 07 09:53:25 2013 +0100
@@ -512,6 +512,17 @@
 
 !NonPositionableExternalStream methodsFor:'reading'!
 
+next
+    "return the next element, if available.
+     If nothing is available, this does never raise a read-beyond end signal.
+     Instead, nil is returned immediately.
+
+     Redefined, to wait on pipes and sockets"
+
+    self readWait.
+    ^ super next
+!
+
 nextOrNil
     "like #next, this returns the next element, if available.
      If nothing is available, this does never raise a read-beyond end signal.
@@ -520,7 +531,14 @@
      Redefined, to wait on pipes and sockets"
 
     self atEnd ifTrue:[^ nil].
-    ^ self next
+    ^ super nextOrNil
+!
+
+peek
+    "Redefined, to wait on pipes and sockets"
+
+    self readWait.
+    ^ super peek
 !
 
 peekOrNil
@@ -560,9 +578,10 @@
 !NonPositionableExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.61 2010-03-04 15:11:43 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.62 2013-02-06 14:47:34 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.61 2010-03-04 15:11:43 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.62 2013-02-06 14:47:34 stefan Exp $'
 ! !
+
--- a/SmallInteger.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/SmallInteger.st	Thu Feb 07 09:53:25 2013 +0100
@@ -18,6 +18,12 @@
 	category:'Magnitude-Numbers'
 !
 
+!SmallInteger primitiveDefinitions!
+%{
+#include <stdio.h>
+%}
+! !
+
 !SmallInteger class methodsFor:'documentation'!
 
 copyright
@@ -4157,9 +4163,10 @@
 !SmallInteger class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.200 2013-01-23 18:03:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.201 2013-02-05 16:01:31 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.200 2013-01-23 18:03:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.201 2013-02-05 16:01:31 stefan Exp $'
 ! !
+
--- a/String.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/String.st	Thu Feb 07 09:53:25 2013 +0100
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #define _STDIO_H_INCLUDED_
-
+#include <stdlib.h>
 #include <ctype.h>
 
 #ifdef LINUX
@@ -3886,10 +3886,10 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.300 2013-01-16 14:11:48 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.301 2013-02-05 15:30:35 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.300 2013-01-16 14:11:48 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.301 2013-02-05 15:30:35 stefan Exp $'
 ! !
 
--- a/UserPreferences.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/UserPreferences.st	Thu Feb 07 09:53:25 2013 +0100
@@ -538,6 +538,7 @@
         AbstractSourceCodeManager availableManagers do:[:eachManager |
             eachManager savePreferencesOn:s
         ].
+        s syncData.
     ].
 
     "
@@ -4268,11 +4269,11 @@
 !UserPreferences class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.327 2013-02-04 16:58:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.328 2013-02-06 16:36:15 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.327 2013-02-04 16:58:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.328 2013-02-06 16:36:15 stefan Exp $'
 !
 
 version_SVN
--- a/Win32OperatingSystem.st	Tue Feb 05 15:50:13 2013 +0100
+++ b/Win32OperatingSystem.st	Thu Feb 07 09:53:25 2013 +0100
@@ -7490,9 +7490,15 @@
     DWORD buffSize = sizeof(buffer)/sizeof(buffer[0]);
 
     // Note: GetComputerNameExA can fail in certain locales!
+#ifdef __MINGW32__
+    if (GetComputerName(buffer, &buffSize) == TRUE) {
+	hostName = __MKSTRING_L(buffer, buffSize);
+    }
+#else
     if (GetComputerNameExW(ComputerNameDnsFullyQualified, buffer, &buffSize) == TRUE) {
 	hostName = __MKU16STRING_MAXLEN(buffer, buffSize);
     }
+#endif
 %}.
     hostName isNil ifTrue:[
 	^ nil.
@@ -12179,7 +12185,11 @@
     #define PERF_SIZE_MASK        (PERF_SIZE_DWORD|PERF_SIZE_LARGE|PERF_SIZE_ZERO|PERF_SIZE_VARIABLE_LEN)
     #define PERF_TYPE_MASK        (PERF_TYPE_NUMBER|PERF_TYPE_COUNTER|PERF_TYPE_TEXT|PERF_TYPE_ZERO)
     #define PERF_NUMBERTYPE_MASK  (PERF_NUMBER_HEX|PERF_NUMBER_DECIMAL|PERF_NUMBER_DEC_1000)
+#ifdef PERF_COUNTER_PRECISION
     #define PERF_COUNTERTYPE_MASK (PERF_COUNTER_VALUE|PERF_COUNTER_RATE|PERF_COUNTER_FRACTION|PERF_COUNTER_BASE|PERF_COUNTER_ELAPSED|PERF_COUNTER_QUEUELEN|PERF_COUNTER_HISTOGRAM|PERF_COUNTER_PRECISION)
+#else
+    #define PERF_COUNTERTYPE_MASK (PERF_COUNTER_VALUE|PERF_COUNTER_RATE|PERF_COUNTER_FRACTION|PERF_COUNTER_BASE|PERF_COUNTER_ELAPSED|PERF_COUNTER_QUEUELEN|PERF_COUNTER_HISTOGRAM)
+#endif
     #define PERF_TEXTTYPE_MASK    (PERF_TEXT_UNICODE|PERF_TEXT_ASCII)
 
     if (!__isByteArray(st_data)) RETURN (nil);
@@ -12282,9 +12292,11 @@
 			case PERF_COUNTER_HISTOGRAM:
 			    __AT_PUT_(st_perCounter, @symbol(COUNTER),@symbol(HISTOGRAM));
 			    break;
+#ifdef PERF_COUNTER_PRECISION
 			case PERF_COUNTER_PRECISION:
 			    __AT_PUT_(st_perCounter, @symbol(COUNTER),@symbol(PRECISION));
 			    break;
+#endif
 		    }
 		    break;
 		case PERF_TYPE_TEXT:
@@ -12686,15 +12698,15 @@
     ^ self getBasicValuesByObject:0 counter:counterIndex timed:false
 !
 
-getBasicValuesByCounter:counterIndex timed:boolean
-    ^ self getBasicValuesByObject:0 counter:counterIndex timed:boolean
+getBasicValuesByCounter:counterIndex timed:aBoolean
+    ^ self getBasicValuesByObject:0 counter:counterIndex timed:aBoolean
 !
 
 getBasicValuesByObject:objectIndex counter:counterIndex
     ^ self getBasicValuesByObject:0 counter:counterIndex timed:false
 !
 
-getBasicValuesByObject:objectIndex counter:counterIndex timed:boolean
+getBasicValuesByObject:objectIndex counter:counterIndex timed:aBoolean
     |data object counter values debugBlock numInstances|
 
     debugBlock := [:obj|
@@ -12727,7 +12739,7 @@
 	values at:'<<singleton>>' put:(counter at:#CounterValueArray) first.
     ].
 
-    boolean ifTrue:[
+    aBoolean ifTrue:[
 	|return|
 
 	return := IdentityDictionary new.
@@ -12746,15 +12758,15 @@
     ^ self getValuesByObject:0 counter:counterIndex timed:false
 !
 
-getValuesByCounter:counterIndex timed:boolean
-    ^ self getValuesByObject:0 counter:counterIndex timed:boolean
+getValuesByCounter:counterIndex timed:aBoolean
+    ^ self getValuesByObject:0 counter:counterIndex timed:aBoolean
 !
 
 getValuesByObject:objectIndex counter:counterIndex
     ^ self getValuesByObject:0 counter:counterIndex timed:false
 !
 
-getValuesByObject:objectIndex counter:counterIndex timed:boolean
+getValuesByObject:objectIndex counter:counterIndex timed:aBoolean
     |data object counter values debugBlock numInstances|
 
     debugBlock := [:obj|
@@ -12787,7 +12799,7 @@
 	values at:'<<singleton>>' put:(counter at:#CounterValueArray) first.
     ].
 
-    boolean ifTrue:[
+    aBoolean ifTrue:[
 	|return|
 
 	return := IdentityDictionary new.
@@ -16502,11 +16514,11 @@
 !Win32OperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.449 2013-02-05 13:30:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.450 2013-02-05 21:01:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.449 2013-02-05 13:30:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.450 2013-02-05 21:01:59 cg Exp $'
 !
 
 version_SVN