Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 29 Mar 2016 08:40:07 +0100
branchjv
changeset 16217 4084ab814cf9
parent 16215 197bbd1cbf8e (current diff)
parent 16216 3075c6c938e1 (diff)
child 16221 29f8fbb81f19
Merge
AbstractSettingsApplication.st
--- a/AbstractSettingsApplication.st	Mon Mar 28 07:02:28 2016 +0200
+++ b/AbstractSettingsApplication.st	Tue Mar 29 08:40:07 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -14199,7 +14201,7 @@
 !
 
 setupForMINGW
-    ExternalBytes sizeofPointer == 4 ifTrue:[
+    ExternalAddress pointerSize == 4 ifTrue:[
         self cc value:'C:\mingw32\bin\gcc'.
         self linkArgs value:'-L..\..\lib\mingw -LC:\mingw32\lib'.
     ] ifFalse:[