--- a/UserPreferences.st	Wed Mar 09 23:24:06 2016 +0100
+++ b/UserPreferences.st	Thu Mar 10 00:48:19 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1998 by eXept Software AG
 	      All Rights Reserved
@@ -582,21 +584,23 @@
           nextPutLine:'Compiler foldConstants: ' , (Compiler foldConstants storeString) , '.';
           nextPutLine:'ParserFlags stcCompilation: ' , (ParserFlags stcCompilation storeString) , '.';
           nextPutLine:'OperatingSystem getOSType = ' , (OperatingSystem getOSType storeString) , ' ifTrue:[';
-          nextPutLine:'  ParserFlags stcCompilationIncludes: ' , (ParserFlags stcCompilationIncludes storeString) , '.';
           nextPutLine:'  ParserFlags stcCompilationDefines: ' , (ParserFlags stcCompilationDefines storeString) , '.';
           nextPutLine:'  ParserFlags stcCompilationOptions: ' , (ParserFlags stcCompilationOptions storeString) , '.';
-          nextPutLine:'  ' , (ParserFlags stcModulePath ? 'modules') storeString , ' asFilename exists ifTrue:[';
-          nextPutLine:'    ParserFlags stcModulePath: ' , (ParserFlags stcModulePath ? 'modules') storeString , '.';
+          nextPutLine:'  ParserFlags ccCompilationOptions: ' , (ParserFlags ccCompilationOptions storeString) , '.';
+          nextPutLine:'  ParserFlags makeCommand: ' , (ParserFlags makeCommand storeString) , '.';
+          nextPutLine:'  ExternalBytes sizeofPointer = ' , (ExternalBytes sizeofPointer storeString) , ' ifTrue:[';
+          nextPutLine:'    ParserFlags stcCompilationIncludes: ' , (ParserFlags stcCompilationIncludes storeString) , '.';
+          nextPutLine:'    ',(ParserFlags stcModulePath ? 'modules') storeString , ' asFilename exists ifTrue:[';
+          nextPutLine:'      ParserFlags stcModulePath: ' , (ParserFlags stcModulePath ? 'modules') storeString , '.';
+          nextPutLine:'    ].';
+          nextPutLine:'    ParserFlags stcPath: ' , (ParserFlags stcPath storeString) , '.';
+          nextPutLine:'    ParserFlags ccPath: ' , (ParserFlags ccPath storeString) , '.';
+          nextPutLine:'    ParserFlags linkArgs: ' , (ParserFlags linkArgs storeString) , '.';
+          nextPutLine:'    ParserFlags linkSharedArgs: ' , (ParserFlags linkSharedArgs storeString) , '.';
+          nextPutLine:'    ParserFlags linkCommand: ' , (ParserFlags linkCommand storeString) , '.';
+          nextPutLine:'    ParserFlags libPath: ' , (ParserFlags libPath storeString) , '.';
+          nextPutLine:'    ParserFlags searchedLibraries: ' , (ParserFlags searchedLibraries storeString) , '.';
           nextPutLine:'  ].';
-          nextPutLine:'  ParserFlags stcPath: ' , (ParserFlags stcPath storeString) , '.';
-          nextPutLine:'  ParserFlags ccCompilationOptions: ' , (ParserFlags ccCompilationOptions storeString) , '.';
-          nextPutLine:'  ParserFlags ccPath: ' , (ParserFlags ccPath storeString) , '.';
-          nextPutLine:'  ParserFlags linkArgs: ' , (ParserFlags linkArgs storeString) , '.';
-          nextPutLine:'  ParserFlags linkSharedArgs: ' , (ParserFlags linkSharedArgs storeString) , '.';
-          nextPutLine:'  ParserFlags linkCommand: ' , (ParserFlags linkCommand storeString) , '.';
-          nextPutLine:'  ParserFlags makeCommand: ' , (ParserFlags makeCommand storeString) , '.';
-          nextPutLine:'  ParserFlags libPath: ' , (ParserFlags libPath storeString) , '.';
-          nextPutLine:'  ParserFlags searchedLibraries: ' , (ParserFlags searchedLibraries storeString) , '.';
           nextPutLine:'].';
 
           nextPutLine:'ObjectMemory justInTimeCompilation: ' , (ObjectMemory justInTimeCompilation storeString) , '.';
@@ -839,8 +843,6 @@
 ! !
 
 
-
-
 !UserPreferences methodsFor:'accessing-changes & history'!
 
 historyManagerAllowEditOfHistory:aBoolean