compiler/libec; ecere: Support for checking platform as a compile time constant

- This addresses format specifier warnings

diff --git a/compiler/bootstrap/ecc/bootstrap/ecc.c b/compiler/bootstrap/ecc/bootstrap/ecc.c
index 7c0ea3d..040722a 100644 (file)
--- a/compiler/bootstrap/ecc/bootstrap/ecc.c
+++ b/compiler/bootstrap/ecc/bootstrap/ecc.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecc.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -652,8 +659,6 @@ __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "   .\n");
 
 static struct __ecereNameSpace__ecere__com__Class * __ecereClass_CompilerApp;
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 extern int GetHostBits(void);
 
 extern void SetSymbolsDir(const char *  s);
@@ -890,7 +895,7 @@ int c;
 unsigned int valid = 1;
 char defaultOutputFile[797];
 unsigned int buildingBootStrap = 0;
-int targetPlatform = __ecereNameSpace__ecere__com__GetRuntimePlatform();
+int targetPlatform = __runtimePlatform;
 int targetBits = GetHostBits();
 
 SetSymbolsDir("");
@@ -1240,6 +1245,13 @@ struct __ecereNameSpace__ecere__com__Instance * output = __ecereNameSpace__ecere
 if(output)
 {
 __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "/* Code generated from eC source file: %s */\n", sourceFileName);
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#if defined(_WIN32)\n");
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#define __runtimePlatform 1\n");
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#elif defined(__APPLE__)\n");
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#define __runtimePlatform 3\n");
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#else\n");
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#define __runtimePlatform 2\n");
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#endif\n");
 __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "#if defined(__GNUC__)\n");
 __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "typedef long long int64;\n");
 __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(output, "typedef unsigned long long uint64;\n");

diff --git a/compiler/bootstrap/ecc/bootstrap/ecc.main.c b/compiler/bootstrap/ecc/bootstrap/ecc.main.c
index 17f7d58..f081ae7 100644 (file)
--- a/compiler/bootstrap/ecc/bootstrap/ecc.main.c
+++ b/compiler/bootstrap/ecc/bootstrap/ecc.main.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecc.main.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/AVLTree.c b/compiler/bootstrap/ecere/bootstrap/AVLTree.c
index 9ad955b..9e36d45 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/AVLTree.c
+++ b/compiler/bootstrap/ecere/bootstrap/AVLTree.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: AVLTree.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/Array.c b/compiler/bootstrap/ecere/bootstrap/Array.c
index 9454e93..2ce2ba5 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/Array.c
+++ b/compiler/bootstrap/ecere/bootstrap/Array.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: Array.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/BTNode.c b/compiler/bootstrap/ecere/bootstrap/BTNode.c
index 599c310..f99143e 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/BTNode.c
+++ b/compiler/bootstrap/ecere/bootstrap/BTNode.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: BTNode.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/BinaryTree.c b/compiler/bootstrap/ecere/bootstrap/BinaryTree.c
index aee8b50..6144d7b 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/BinaryTree.c
+++ b/compiler/bootstrap/ecere/bootstrap/BinaryTree.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: BinaryTree.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/BufferedFile.c b/compiler/bootstrap/ecere/bootstrap/BufferedFile.c
index 3d2473c..dea879b 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/BufferedFile.c
+++ b/compiler/bootstrap/ecere/bootstrap/BufferedFile.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: BufferedFile.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c b/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c
index 35a6c38..5c65f0f 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c
+++ b/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: BuiltInContainer.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/Container.c b/compiler/bootstrap/ecere/bootstrap/Container.c
index 6190d61..3923656 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/Container.c
+++ b/compiler/bootstrap/ecere/bootstrap/Container.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: Container.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c b/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c
index 0760a94..a30a309 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c
+++ b/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: CustomAVLTree.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/DualPipe.c b/compiler/bootstrap/ecere/bootstrap/DualPipe.c
index 1c71fa7..652011e 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/DualPipe.c
+++ b/compiler/bootstrap/ecere/bootstrap/DualPipe.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: DualPipe.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/File.c b/compiler/bootstrap/ecere/bootstrap/File.c
index 4a8191b..a6114e2 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/File.c
+++ b/compiler/bootstrap/ecere/bootstrap/File.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: File.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/LinkList.c b/compiler/bootstrap/ecere/bootstrap/LinkList.c
index 43a60d8..ecadaea 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/LinkList.c
+++ b/compiler/bootstrap/ecere/bootstrap/LinkList.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: LinkList.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/List.c b/compiler/bootstrap/ecere/bootstrap/List.c
index 09d6152..fa0e9da 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/List.c
+++ b/compiler/bootstrap/ecere/bootstrap/List.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: List.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/Map.c b/compiler/bootstrap/ecere/bootstrap/Map.c
index 1e2e855..47f7e20 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/Map.c
+++ b/compiler/bootstrap/ecere/bootstrap/Map.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: Map.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -516,7 +523,7 @@ return newNode;
 }
 else
 {
-struct __ecereNameSpace__ecere__com__MapNode * node = ((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root) ? __ecereMethod___ecereNameSpace__ecere__com__AVLNode_Find(((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root), ((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[5].__anon1.__anon1.dataTypeClass, (uint64)__ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(newNode)) : (((void *)0));
+struct __ecereNameSpace__ecere__com__MapNode * node = ((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root) ? __ecereMethod___ecereNameSpace__ecere__com__AVLNode_Find((void *)((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root), ((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[5].__anon1.__anon1.dataTypeClass, (uint64)__ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(newNode)) : (((void *)0));
 
 if(!node)
 {
@@ -599,7 +606,7 @@ return (struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace
 
 struct __ecereNameSpace__ecere__com__MapNode * __ecereMethod___ecereNameSpace__ecere__com__Map_GetAtPosition(struct __ecereNameSpace__ecere__com__Instance * this, const uint64 pos, unsigned int create)
 {
-struct __ecereNameSpace__ecere__com__MapNode * node = ((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root) ? __ecereMethod___ecereNameSpace__ecere__com__AVLNode_Find(((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root), ((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[5].__anon1.__anon1.dataTypeClass, pos) : (((void *)0));
+struct __ecereNameSpace__ecere__com__MapNode * node = ((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root) ? __ecereMethod___ecereNameSpace__ecere__com__AVLNode_Find((void *)((struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)this + structSize_Instance)))->root), ((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[5].__anon1.__anon1.dataTypeClass, pos) : (((void *)0));
 
 if(!node && create)
 {

diff --git a/compiler/bootstrap/ecere/bootstrap/OldList.c b/compiler/bootstrap/ecere/bootstrap/OldList.c
index e5a284f..cffe615 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/OldList.c
+++ b/compiler/bootstrap/ecere/bootstrap/OldList.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: OldList.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -426,9 +433,9 @@ this->last = item;
 if(link->next)
 ((struct __ecereNameSpace__ecere__sys__Item *)((unsigned char *)link->next + this->offset))->prev = item;
 this->count++;
-return 0x1;
+return 1;
 }
-return 0x0;
+return 0;
 }
 
 void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void * item)
@@ -505,7 +512,7 @@ this->count = 0;
 void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(struct __ecereNameSpace__ecere__sys__OldList * this)
 {
 this->offset = 0;
-this->circ = 0x0;
+this->circ = 0;
 this->count = 0;
 this->first = this->last = (((void *)0));
 }
@@ -639,7 +646,7 @@ return result;
 
 unsigned int __ecereMethod___ecereNameSpace__ecere__sys__OldList_PlaceName(struct __ecereNameSpace__ecere__sys__OldList * this, const char * name, void ** place)
 {
-unsigned int result = 0x1;
+unsigned int result = 1;
 void * item;
 struct __ecereNameSpace__ecere__sys__NamedItem * link;
 int compare = 1;
@@ -655,7 +662,7 @@ if(!item)
 else
 *place = link->prev;
 if(compare)
-result = 0x1;
+result = 1;
 else
 ;
 return result;
@@ -663,14 +670,14 @@ return result;
 
 unsigned int __ecereMethod___ecereNameSpace__ecere__sys__OldList_AddName(struct __ecereNameSpace__ecere__sys__OldList * this, void * item)
 {
-unsigned int result = 0x0;
+unsigned int result = 0;
 void * place;
 struct __ecereNameSpace__ecere__sys__NamedItem * link = ((struct __ecereNameSpace__ecere__sys__NamedItem *)((unsigned char *)item + this->offset));
 
 if(__ecereMethod___ecereNameSpace__ecere__sys__OldList_PlaceName(this, link->name, &place))
 {
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(this, place, item);
-result = 0x1;
+result = 1;
 }
 return result;
 }

diff --git a/compiler/bootstrap/ecere/bootstrap/String.c b/compiler/bootstrap/ecere/bootstrap/String.c
index a008fe4..187e262 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/String.c
+++ b/compiler/bootstrap/ecere/bootstrap/String.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: String.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -343,8 +350,6 @@ extern int strcmp(const char * , const char * );
 
 extern void *  memmove(void * , const void * , size_t size);
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 char * __ecereNameSpace__ecere__sys__StripLastDirectory(const char * string, char * output)
 {
 int c;
@@ -377,14 +382,14 @@ else
 output[c] = '\0';
 }
 else
-strcpy(output, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "\\" : "/"));
+strcpy(output, ((__runtimePlatform == 1) ? "\\" : "/"));
 return output;
 }
 else
 {
 if(c == 0)
 {
-strcpy(output, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "\\" : "/"));
+strcpy(output, ((__runtimePlatform == 1) ? "\\" : "/"));
 return output;
 }
 else
@@ -405,7 +410,7 @@ int c = 0;
 for(; (ch = string[c]) && (ch == '/' || ch == '\\'); c++)
 ;
 if(c)
-part[len++] = ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? '\\' : '/');
+part[len++] = ((__runtimePlatform == 1) ? '\\' : '/');
 else
 {
 for(; (ch = string[c]) && (ch != '/' && ch != '\\'); c++)
@@ -521,7 +526,7 @@ fileName[len] = (char)0;
 isURL = 1;
 c = len;
 }
-else if(__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1)
+else if(__runtimePlatform == 1)
 {
 if(addedPath[0] && addedPath[1] == ':' && addedPath[0] != '<')
 {
@@ -546,7 +551,7 @@ urlFileName[1] = '\0';
 }
 else if(!modified && (addedPath[0] == '\\' || addedPath[0] == '/'))
 {
-if(__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1)
+if(__runtimePlatform == 1)
 {
 if(addedPath[0] == '/' && !addedPath[1])
 {
@@ -601,7 +606,7 @@ len--;
 if(len > 0)
 {
 modified = 1;
-if(strstr(directory, "..") == directory && (!directory[2] || directory[2] == ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? '\\' : '/') || directory[2] == '/'))
+if(strstr(directory, "..") == directory && (!directory[2] || directory[2] == ((__runtimePlatform == 1) ? '\\' : '/') || directory[2] == '/'))
 {
 int strLen = strlen(fileName) - 1;
 
@@ -626,7 +631,7 @@ strcat(fileName, "..");
 }
 else
 {
-if(__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1)
+if(__runtimePlatform == 1)
 {
 if(!strLen && fileName[0] == '\\' && fileName[1] == '\\')
 {
@@ -811,7 +816,7 @@ len--;
 if(len > 0)
 {
 modified = 1;
-if(strstr(directory, "..") == directory && (!directory[2] || directory[2] == ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? '\\' : '/')))
+if(strstr(directory, "..") == directory && (!directory[2] || directory[2] == ((__runtimePlatform == 1) ? '\\' : '/')))
 {
 int strLen = strlen(fileName) - 1;
 
@@ -833,7 +838,7 @@ strLen = (__simpleStruct0 = urlFileName - fileName, (strLen > __simpleStruct0) ?
 }
 if(!strcmp(fileName + strLen + (separator ? 2 : 1), ".."))
 {
-strcat(fileName, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "\\" : "/"));
+strcat(fileName, ((__runtimePlatform == 1) ? "\\" : "/"));
 strcat(fileName, "..");
 }
 else
@@ -883,7 +888,7 @@ if(notZeroLen)
 if(isURL)
 fileName[strLen++] = '/';
 else
-fileName[strLen++] = ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? '\\' : '/');
+fileName[strLen++] = ((__runtimePlatform == 1) ? '\\' : '/');
 }
 fileName[strLen] = '\0';
 if(strLen + strlen(directory) > (797) - 3)
@@ -929,11 +934,11 @@ for(; toRest[0]; )
 __ecereNameSpace__ecere__sys__SplitDirectory(toRest, toPart, toRest);
 if(!different)
 __ecereNameSpace__ecere__sys__SplitDirectory(pathRest, pathPart, pathRest);
-if(different || ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? (strcasecmp) : strcmp)(toPart, pathPart))
+if(different || ((__runtimePlatform == 1) ? (strcasecmp) : strcmp)(toPart, pathPart))
 {
 different = 1;
 strcat(destination, "..");
-strcat(destination, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "\\" : "/"));
+strcat(destination, ((__runtimePlatform == 1) ? "\\" : "/"));
 }
 }
 if(different)
@@ -1429,7 +1434,7 @@ for(; ofRest[0] && pathRest[0]; )
 {
 __ecereNameSpace__ecere__sys__SplitDirectory(ofRest, ofPart, ofRest);
 __ecereNameSpace__ecere__sys__SplitDirectory(pathRest, pathPart, pathRest);
-if(((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? (strcasecmp) : strcmp)(pathPart, ofPart))
+if(((__runtimePlatform == 1) ? (strcasecmp) : strcmp)(pathPart, ofPart))
 return 0;
 }
 if(!ofRest[0] && !pathRest[0])
@@ -1498,8 +1503,8 @@ void __ecereRegisterModule_String(struct __ecereNameSpace__ecere__com__Instance
 {
 struct __ecereNameSpace__ecere__com__Class __attribute__((unused)) * class;
 
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::sys::DIR_SEP", "(GetRuntimePlatform() == win32) ? '\\\\' : '/'", module, 4);
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::sys::DIR_SEPS", "(GetRuntimePlatform() == win32) ? \"\\\\\" : \"/\"", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::sys::DIR_SEP", "(__runtimePlatform == win32) ? '\\\\' : '/'", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::sys::DIR_SEPS", "(__runtimePlatform == win32) ? \"\\\\\" : \"/\"", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::sys::MAX_F_STRING", "1025", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::sys::MAX_EXTENSION", "17", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::sys::MAX_FILENAME", "274", module, 4);

diff --git a/compiler/bootstrap/ecere/bootstrap/System.c b/compiler/bootstrap/ecere/bootstrap/System.c
index 40ca4b8..24ab3c0 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/System.c
+++ b/compiler/bootstrap/ecere/bootstrap/System.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: System.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/TempFile.c b/compiler/bootstrap/ecere/bootstrap/TempFile.c
index f4194cb..963792e 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/TempFile.c
+++ b/compiler/bootstrap/ecere/bootstrap/TempFile.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: TempFile.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/dataTypes.c b/compiler/bootstrap/ecere/bootstrap/dataTypes.c
index 61a368b..eb99888 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/dataTypes.c
+++ b/compiler/bootstrap/ecere/bootstrap/dataTypes.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: dataTypes.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -2053,23 +2060,21 @@ result = -1;
 return result;
 }
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 static const char * __ecereNameSpace__ecere__com__Int64_OnGetString(struct __ecereNameSpace__ecere__com__Class * _class, long long * data, char * string, void * fieldData, unsigned int * needClass)
 {
-sprintf(string, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), *data);
+sprintf(string, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), *data);
 return string;
 }
 
 static const char * __ecereNameSpace__ecere__com__UInt64_OnGetString(struct __ecereNameSpace__ecere__com__Class * _class, uint64 * data, char * string, void * fieldData, unsigned int * needClass)
 {
-sprintf(string, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64u" : "%llu"), *data);
+sprintf(string, ((__runtimePlatform == 1) ? "%I64u" : "%llu"), *data);
 return string;
 }
 
 static const char * __ecereNameSpace__ecere__com__UInt64Hex_OnGetString(struct __ecereNameSpace__ecere__com__Class * _class, uint64 * data, char * string, void * fieldData, unsigned int * needClass)
 {
-sprintf(string, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), *data);
+sprintf(string, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), *data);
 return string;
 }
 
@@ -3195,11 +3200,11 @@ __ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::MINFLOAT", "1.
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::MAXFLOAT", "3.40282346638528860e+38f", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::MINDOUBLE", "2.2250738585072014e-308", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::MAXDOUBLE", "1.7976931348623158e+308", module, 4);
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64HEXLL", "(GetRuntimePlatform() == win32) ? \"0x%I64XLL\" : \"0x%llXLL\"", module, 4);
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64HEX", "(GetRuntimePlatform() == win32) ? \"0x%I64X\" : \"0x%llX\"", module, 4);
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64DLL", "(GetRuntimePlatform() == win32) ? \"%I64dLL\" : \"%lldLL\"", module, 4);
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64D", "(GetRuntimePlatform() == win32) ? \"%I64d\" : \"%lld\"", module, 4);
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64U", "(GetRuntimePlatform() == win32) ? \"%I64u\" : \"%llu\"", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64HEXLL", "(__runtimePlatform == win32) ? \"0x%I64XLL\" : \"0x%llXLL\"", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64HEX", "(__runtimePlatform == win32) ? \"0x%I64X\" : \"0x%llX\"", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64DLL", "(__runtimePlatform == win32) ? \"%I64dLL\" : \"%lldLL\"", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64D", "(__runtimePlatform == win32) ? \"%I64d\" : \"%lld\"", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("ecere::com::FORMAT64U", "(__runtimePlatform == win32) ? \"%I64u\" : \"%llu\"", module, 4);
 class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(0, "ecere::com::IOChannel", 0, 0, 0, 0, 0, module, 4, 1);
 if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
 __ecereClass___ecereNameSpace__ecere__com__IOChannel = class;
@@ -3225,7 +3230,7 @@ __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_buffer = __ecerePropM___e
 __ecerePropM___ecereNameSpace__ecere__com__SerialBuffer_size = __ecereNameSpace__ecere__com__eClass_AddProperty(class, "size", "uint", __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_Set_size, __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_Get_size, 1);
 if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application)
 __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_size = __ecerePropM___ecereNameSpace__ecere__com__SerialBuffer_size, __ecerePropM___ecereNameSpace__ecere__com__SerialBuffer_size = (void *)0;
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Enum_OnGetString", "const char * ecere::com::Enum_OnGetString(ecere::com::Class _class, int64 * data, char * tempString, void * fieldData, bool * needClass)", __ecereNameSpace__ecere__com__Enum_OnGetString, module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Enum_OnGetString", "const char * ecere::com::Enum_OnGetString(ecere::com::Class _class, void * data, char * tempString, void * fieldData, bool * needClass)", __ecereNameSpace__ecere__com__Enum_OnGetString, module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Integer_OnGetString", "const char * ecere::com::Integer_OnGetString(ecere::com::Class _class, int * data, char * string, void * fieldData, bool * needClass)", __ecereNameSpace__ecere__com__Integer_OnGetString, module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Byte_OnSerialize", "void ecere::com::Byte_OnSerialize(ecere::com::Class _class, byte * data, ecere::com::IOChannel channel)", __ecereNameSpace__ecere__com__Byte_OnSerialize, module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Byte_OnUnserialize", "void ecere::com::Byte_OnUnserialize(ecere::com::Class _class, byte * data, ecere::com::IOChannel channel)", __ecereNameSpace__ecere__com__Byte_OnUnserialize, module, 4);

diff --git a/compiler/bootstrap/ecere/bootstrap/ecere.main.c b/compiler/bootstrap/ecere/bootstrap/ecere.main.c
index 1d84ad2..c35c118 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/ecere.main.c
+++ b/compiler/bootstrap/ecere/bootstrap/ecere.main.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecere.main.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/i18n.c b/compiler/bootstrap/ecere/bootstrap/i18n.c
index 1f5a89e..67adc1e 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/i18n.c
+++ b/compiler/bootstrap/ecere/bootstrap/i18n.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: i18n.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecere/bootstrap/instance.c b/compiler/bootstrap/ecere/bootstrap/instance.c
index a5363c5..7c810d1 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/instance.c
+++ b/compiler/bootstrap/ecere/bootstrap/instance.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: instance.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -5381,7 +5388,7 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("strstr", "char * strstr(
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("strspn", "uintsize strspn(const char *, const char *)", strspn, module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("strcspn", "uintsize strcspn(const char *, const char *)", strcspn, module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("strpbrk", "char * strpbrk(const char *, const char *)", strpbrk, module, 4);
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine("fstrcmp", "(GetRuntimePlatform() == win32) ? strcmpi : strcmp", module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine("fstrcmp", "(__runtimePlatform == win32) ? strcmpi : strcmp", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("strcmpi", "strcasecmp", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterDefine("strnicmp", "strncasecmp", module, 4);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("strcasecmp", "int strcasecmp(const char *, const char *)", strcasecmp, module, 4);

diff --git a/compiler/bootstrap/ecere/bootstrap/memory.c b/compiler/bootstrap/ecere/bootstrap/memory.c
index 6a32d8e..dba06c6 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/memory.c
+++ b/compiler/bootstrap/ecere/bootstrap/memory.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: memory.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecp/bootstrap/ecp.c b/compiler/bootstrap/ecp/bootstrap/ecp.c
index 80d4630..229fef9 100644 (file)
--- a/compiler/bootstrap/ecp/bootstrap/ecp.c
+++ b/compiler/bootstrap/ecp/bootstrap/ecp.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecp.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -2331,8 +2338,6 @@ struct __ecereNameSpace__ecere__sys__OldList values;
 long long largest;
 } __attribute__ ((gcc_struct));
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 extern void OutputExpression(struct Expression * exp, struct __ecereNameSpace__ecere__com__Instance * f);
 
 int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts;
@@ -2515,9 +2520,9 @@ for(value = e->values.first; value; value = value->next)
 {
 __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "         %s = ", value->name);
 if(!strcmp(_class->dataTypeString, "uint64") && *(uint64 *)&value->data > (((long long)0x7fffffffffffffffLL)))
-__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), *(uint64 *)&value->data);
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), *(uint64 *)&value->data);
 else
-__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), value->data);
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), value->data);
 __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "\n");
 }
 __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "         .\n");
@@ -2680,7 +2685,7 @@ char defaultSymFile[797];
 char * cppCommand = (((void *)0));
 char * cppOptions = (((void *)0));
 int cppOptionsLen = 0;
-int targetPlatform = __ecereNameSpace__ecere__com__GetRuntimePlatform();
+int targetPlatform = __runtimePlatform;
 int targetBits = GetHostBits();
 
 for(c = 1; c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc; c++)

diff --git a/compiler/bootstrap/ecp/bootstrap/ecp.main.c b/compiler/bootstrap/ecp/bootstrap/ecp.main.c
index 183a249..318bb62 100644 (file)
--- a/compiler/bootstrap/ecp/bootstrap/ecp.main.c
+++ b/compiler/bootstrap/ecp/bootstrap/ecp.main.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecp.main.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/ecs/bootstrap/ecs.c b/compiler/bootstrap/ecs/bootstrap/ecs.c
index e66cb44..462857d 100644 (file)
--- a/compiler/bootstrap/ecs/bootstrap/ecs.c
+++ b/compiler/bootstrap/ecs/bootstrap/ecs.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecs.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -2407,8 +2414,6 @@ __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "}\n");
 
 static struct __ecereNameSpace__ecere__com__Class * __ecereClass_SymbolgenApp;
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 extern int GetHostBits(void);
 
 extern void SetSymbolsDir(const char *  s);
@@ -2580,7 +2585,7 @@ const char * output = (((void *)0));
 
 outputPot = 0;
 disabledPooling = 0;
-targetPlatform = __ecereNameSpace__ecere__com__GetRuntimePlatform();
+targetPlatform = __runtimePlatform;
 targetBits = GetHostBits();
 for(c = 1; c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc; c++)
 {

diff --git a/compiler/bootstrap/ecs/bootstrap/ecs.main.c b/compiler/bootstrap/ecs/bootstrap/ecs.main.c
index f5a0a98..ce734c6 100644 (file)
--- a/compiler/bootstrap/ecs/bootstrap/ecs.main.c
+++ b/compiler/bootstrap/ecs/bootstrap/ecs.main.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecs.main.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/ast.c b/compiler/bootstrap/libec/bootstrap/ast.c
index e258e7d..441c230 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/ast.c
+++ b/compiler/bootstrap/libec/bootstrap/ast.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ast.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/copy.c b/compiler/bootstrap/libec/bootstrap/copy.c
index c36c541..69fb5c3 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/copy.c
+++ b/compiler/bootstrap/libec/bootstrap/copy.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: copy.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/dbpass.c b/compiler/bootstrap/libec/bootstrap/dbpass.c
index 89692da..e6c27a0 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/dbpass.c
+++ b/compiler/bootstrap/libec/bootstrap/dbpass.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: dbpass.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/ec.main.c b/compiler/bootstrap/libec/bootstrap/ec.main.c
index 35ed283..3adc691 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/ec.main.c
+++ b/compiler/bootstrap/libec/bootstrap/ec.main.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ec.main.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/ecdefs.c b/compiler/bootstrap/libec/bootstrap/ecdefs.c
index a382b40..0ef1667 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/ecdefs.c
+++ b/compiler/bootstrap/libec/bootstrap/ecdefs.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: ecdefs.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/expression.c b/compiler/bootstrap/libec/bootstrap/expression.c
index 39713fa..4a5ad1e 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/expression.c
+++ b/compiler/bootstrap/libec/bootstrap/expression.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: expression.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/firstPass.c b/compiler/bootstrap/libec/bootstrap/firstPass.c
index 7751084..0512b6a 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/firstPass.c
+++ b/compiler/bootstrap/libec/bootstrap/firstPass.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: firstPass.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/freeAst.c b/compiler/bootstrap/libec/bootstrap/freeAst.c
index 0af6524..8d784c6 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/freeAst.c
+++ b/compiler/bootstrap/libec/bootstrap/freeAst.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: freeAst.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/grammar.c b/compiler/bootstrap/libec/bootstrap/grammar.c
index 21ed783..45c8edc 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/grammar.c
+++ b/compiler/bootstrap/libec/bootstrap/grammar.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: grammar.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/lexer.c b/compiler/bootstrap/libec/bootstrap/lexer.c
index 9baf61c..1631ab8 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/lexer.c
+++ b/compiler/bootstrap/libec/bootstrap/lexer.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: lexer.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/loadSymbols.c b/compiler/bootstrap/libec/bootstrap/loadSymbols.c
index 3221b31..39171ca 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/loadSymbols.c
+++ b/compiler/bootstrap/libec/bootstrap/loadSymbols.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: loadSymbols.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -1705,8 +1712,6 @@ struct __ecereNameSpace__ecere__com__IteratorPointer * pointer;
 
 extern int sprintf(char * , const char * , ...);
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__List_TPL_ecere__com__Module_;
 
 unsigned int __ecereMethod___ecereNameSpace__ecere__sys__OldList_AddName(struct __ecereNameSpace__ecere__sys__OldList * this, void *  item);
@@ -1821,7 +1826,7 @@ loadedModule = __ecereNameSpace__ecere__com__eModule_LoadStrict(privateModule, n
 if(loadedModule)
 {
 ((struct __ecereNameSpace__ecere__com__Module *)(((char *)loadedModule + structSize_Instance)))->importType = importType;
-module->dllOnly = 0x0;
+module->dllOnly = 0;
 if(list)
 ((struct __ecereNameSpace__ecere__com__IteratorPointer * (*)(struct __ecereNameSpace__ecere__com__Instance *, uint64 value))__extension__ ({
 struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = list;
@@ -1871,7 +1876,7 @@ char configDir[274];
 
 strcpy(symFile, ((char * )(__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&dir))));
 __ecereNameSpace__ecere__sys__PathCat(symFile, "obj");
-sprintf(configDir, "debug.%s", (__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "win32" : "linux");
+sprintf(configDir, "debug.%s", (__runtimePlatform == 1) ? "win32" : (__runtimePlatform == 3) ? "apple" : "linux");
 __ecereNameSpace__ecere__sys__PathCat(symFile, configDir);
 __ecereNameSpace__ecere__sys__PathCat(symFile, name);
 __ecereNameSpace__ecere__sys__ChangeExtension(symFile, "sym", symFile);
@@ -1899,7 +1904,7 @@ int FindIncludeFileID(char * includeFile)
 int c;
 
 for(c = 0; c < numIncludes; c++)
-if(!((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? (strcasecmp) : strcmp)(includes[c], includeFile))
+if(!((__runtimePlatform == 1) ? (strcasecmp) : strcmp)(includes[c], includeFile))
 return c + 1;
 return 0;
 }

diff --git a/compiler/bootstrap/libec/bootstrap/output.c b/compiler/bootstrap/libec/bootstrap/output.c
index 788ed13..210d1be 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/output.c
+++ b/compiler/bootstrap/libec/bootstrap/output.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: output.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -3824,7 +3831,7 @@ void OutputTree(struct __ecereNameSpace__ecere__sys__OldList * ast, struct __ece
 {
 struct External * external;
 
-outputLine = 31;
+outputLine = 38;
 for(external = ast->first; external; external = external->next)
 {
 switch(external->type)

diff --git a/compiler/bootstrap/libec/bootstrap/pass0.c b/compiler/bootstrap/libec/bootstrap/pass0.c
index cdf72ec..3ba8c49 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass0.c
+++ b/compiler/bootstrap/libec/bootstrap/pass0.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: pass0.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/pass1.c b/compiler/bootstrap/libec/bootstrap/pass1.c
index 8bdf427..f76e42e 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass1.c
+++ b/compiler/bootstrap/libec/bootstrap/pass1.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: pass1.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/pass15.c b/compiler/bootstrap/libec/bootstrap/pass15.c
index 06bc855..5a637b4 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass15.c
+++ b/compiler/bootstrap/libec/bootstrap/pass15.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: pass15.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -1493,8 +1500,6 @@ exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpCast(MkTypeName(s
 
 extern int sprintf(char * , const char * , ...);
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 extern char *  strcat(char * , const char * );
 
 extern char *  __ecereNameSpace__ecere__sys__CopyString(const char *  string);
@@ -1504,9 +1509,9 @@ char * PrintInt(long long result)
 char temp[100];
 
 if(result > (((int)0x7fffffff)))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
 else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
 if(result > (((int)0x7fffffff)) || result < (((int)0x80000000)))
 strcat(temp, "LL");
 return __ecereNameSpace__ecere__sys__CopyString(temp);
@@ -1517,11 +1522,11 @@ char * PrintUInt(uint64 result)
 char temp[100];
 
 if(result > (0xffffffff))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
 else if(result > (((int)0x7fffffff)))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
 else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
 return __ecereNameSpace__ecere__sys__CopyString(temp);
 }
 
@@ -1530,9 +1535,9 @@ char * PrintInt64(long long result)
 char temp[100];
 
 if(result > (((int)0x7fffffff)) || result < (((int)0x80000000)))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64dLL" : "%lldLL"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64dLL" : "%lldLL"), result);
 else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
 return __ecereNameSpace__ecere__sys__CopyString(temp);
 }
 
@@ -1541,11 +1546,11 @@ char * PrintUInt64(uint64 result)
 char temp[100];
 
 if(result > (0xffffffff))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
 else if(result > (((int)0x7fffffff)))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
 else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
 return __ecereNameSpace__ecere__sys__CopyString(temp);
 }
 
@@ -1554,9 +1559,9 @@ char * PrintHexUInt(uint64 result)
 char temp[100];
 
 if(result > (0xffffffff))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
 else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
 if(result > (0xffffffff))
 strcat(temp, "LL");
 return __ecereNameSpace__ecere__sys__CopyString(temp);
@@ -1567,9 +1572,9 @@ char * PrintHexUInt64(uint64 result)
 char temp[100];
 
 if(result > (0xffffffff))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
 else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
 return __ecereNameSpace__ecere__sys__CopyString(temp);
 }
 
@@ -5432,9 +5437,9 @@ char constant[256];
 
 sourceExp->type = 2;
 if(!strcmp(baseClass->dataTypeString, "int") || !strcmp(baseClass->dataTypeString, "int64") || !strcmp(baseClass->dataTypeString, "short") || !strcmp(baseClass->dataTypeString, "char"))
-sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), value->data);
+sprintf(constant, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), value->data);
 else
-sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), value->data);
+sprintf(constant, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), value->data);
 sourceExp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
 }
 while(converts.first)
@@ -13627,9 +13632,9 @@ FreeExpContents(exp);
 exp->type = 2;
 exp->isConstant = 1;
 if(!strcmp(baseClass->dataTypeString, "int") || !strcmp(baseClass->dataTypeString, "int64") || !strcmp(baseClass->dataTypeString, "char") || !strcmp(baseClass->dataTypeString, "short"))
-sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), value->data);
+sprintf(constant, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), value->data);
 else
-sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), value->data);
+sprintf(constant, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), value->data);
 exp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
 exp->expType = MkClassType(baseClass->fullName);
 break;
@@ -14156,7 +14161,12 @@ if(id->_class && id->_class->__anon1.__anon1.name)
 {
 id->classSym = id->_class->__anon1.__anon1.symbol;
 }
-if(strstr(id->string, "__ecereClass") == id->string)
+if(!strcmp(id->string, "__runtimePlatform"))
+{
+exp->expType = ProcessTypeString("ecere::com::Platform", 1);
+break;
+}
+else if(strstr(id->string, "__ecereClass") == id->string)
 {
 exp->expType = ProcessTypeString("ecere::com::Class", 1);
 break;

diff --git a/compiler/bootstrap/libec/bootstrap/pass16.c b/compiler/bootstrap/libec/bootstrap/pass16.c
index bb6ee8d..0287ee6 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass16.c
+++ b/compiler/bootstrap/libec/bootstrap/pass16.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: pass16.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/pass2.c b/compiler/bootstrap/libec/bootstrap/pass2.c
index 1d805f0..158011d 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass2.c
+++ b/compiler/bootstrap/libec/bootstrap/pass2.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: pass2.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -1426,8 +1433,6 @@ int pos;
 uint64 mask;
 } __attribute__ ((gcc_struct));
 
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
-
 extern struct Expression * MkExpConstant(const char *  string);
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ClassProperty;
@@ -1964,9 +1969,9 @@ struct Declarator * decl = SpecDeclFromString(_class->dataTypeString, specs, (((
 struct TypeName * type = MkTypeName(specs, decl);
 
 if(bitMember->mask > (0xffffffff))
-sprintf(mask, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), bitMember->mask);
+sprintf(mask, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), bitMember->mask);
 else
-sprintf(mask, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), bitMember->mask);
+sprintf(mask, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), bitMember->mask);
 sprintf(shift, "%d", bitMember->pos);
 exp->__anon1.op.exp1 = memberExp->__anon1.member.exp;
 if(exp->__anon1.op.op == XOR_ASSIGN)
@@ -3606,9 +3611,9 @@ struct Declarator * decl = SpecDeclFromString(bitMember->dataTypeString, specs,
 struct TypeName * type = MkTypeName(specs, decl);
 
 if(bitMember->mask > (0xffffffff))
-sprintf(mask, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), bitMember->mask);
+sprintf(mask, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), bitMember->mask);
 else
-sprintf(mask, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), bitMember->mask);
+sprintf(mask, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), bitMember->mask);
 sprintf(shift, "%d", bitMember->pos);
 FreeIdentifier(exp->__anon1.member.member);
 ListAdd(list, MkExpCast(type, MkExpBrackets(MkListOne(MkExpOp(MkExpBrackets(MkListOne(MkExpOp(exp->__anon1.member.exp, '&', MkExpConstant(mask)))), RIGHT_OP, MkExpConstant(shift))))));

diff --git a/compiler/bootstrap/libec/bootstrap/pass3.c b/compiler/bootstrap/libec/bootstrap/pass3.c
index 7b3e70c..80089ae 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass3.c
+++ b/compiler/bootstrap/libec/bootstrap/pass3.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: pass3.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/shortcuts.c b/compiler/bootstrap/libec/bootstrap/shortcuts.c
index 50d613f..43b572b 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/shortcuts.c
+++ b/compiler/bootstrap/libec/bootstrap/shortcuts.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: shortcuts.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/bootstrap/libec/bootstrap/type.c b/compiler/bootstrap/libec/bootstrap/type.c
index 42abf93..5e786c3 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/type.c
+++ b/compiler/bootstrap/libec/bootstrap/type.c
@@ -1,4 +1,11 @@
 /* Code generated from eC source file: type.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;

diff --git a/compiler/ecc/ecc.ec b/compiler/ecc/ecc.ec
index 0ea90d5..1f7fbd8 100644 (file)
--- a/compiler/ecc/ecc.ec
+++ b/compiler/ecc/ecc.ec
@@ -245,7 +245,7 @@ class CompilerApp : Application
       char defaultOutputFile[MAX_LOCATION];
       bool buildingBootStrap = false;
 
-      Platform targetPlatform = GetRuntimePlatform();
+      Platform targetPlatform = __runtimePlatform;
       int targetBits = GetHostBits();
 
 #ifdef _DEBUG
@@ -651,6 +651,14 @@ class CompilerApp : Application
                   if(output)
                   {
                      output.Printf("/* Code generated from eC source file: %s */\n", sourceFileName);
+                     output.Printf("#if defined(_WIN32)\n");
+                     output.Printf("#define __runtimePlatform 1\n");
+                     output.Printf("#elif defined(__APPLE__)\n");
+                     output.Printf("#define __runtimePlatform 3\n");
+                     output.Printf("#else\n");
+                     output.Printf("#define __runtimePlatform 2\n");
+                     output.Printf("#endif\n");
+
                      output.Printf("#if defined(__GNUC__)\n");
                         output.Printf("typedef long long int64;\n");
                         output.Printf("typedef unsigned long long uint64;\n");

diff --git a/compiler/ecp/ecp.ec b/compiler/ecp/ecp.ec
index efe099e..08af533 100644 (file)
--- a/compiler/ecp/ecp.ec
+++ b/compiler/ecp/ecp.ec
@@ -1331,7 +1331,7 @@ class PrecompApp : Application
       /*char ** argv = null;
       int argc = 0;*/
 
-      Platform targetPlatform = GetRuntimePlatform();
+      Platform targetPlatform = __runtimePlatform;
       int targetBits = GetHostBits();
       /*
       for(c = 0; c<this.argc; c++)

diff --git a/compiler/ecs/ecs.ec b/compiler/ecs/ecs.ec
index a583d36..dd24074 100644 (file)
--- a/compiler/ecs/ecs.ec
+++ b/compiler/ecs/ecs.ec
@@ -1617,7 +1617,7 @@ class SymbolgenApp : Application
 
       outputPot = false;
       disabledPooling = false;
-      targetPlatform = GetRuntimePlatform();
+      targetPlatform = __runtimePlatform;
       targetBits = GetHostBits();
 
       /*

diff --git a/compiler/libec/src/ast.ec b/compiler/libec/src/ast.ec
index 2ebb573..bb6a548 100644 (file)
--- a/compiler/libec/src/ast.ec
+++ b/compiler/libec/src/ast.ec
@@ -2950,7 +2950,7 @@ public void OutputIntlStrings()
       {
          const char * filePrefix = "";
          if(!(srcFile[0] && (srcFile[1] == ':' || srcFile[0] == '/')))
-            filePrefix = "./"; //(GetRuntimePlatform() == win32) ? ".\\" : "./";
+            filePrefix = "./"; //(__runtimePlatform == win32) ? ".\\" : "./";
          // GetSystemPathBuffer(srcFileFixed, srcFile);
          GetSlashPathBuffer(srcFileFixed, srcFile);
 

diff --git a/compiler/libec/src/loadSymbols.ec b/compiler/libec/src/loadSymbols.ec
index 7601af6..e313f96 100644 (file)
--- a/compiler/libec/src/loadSymbols.ec
+++ b/compiler/libec/src/loadSymbols.ec
@@ -855,7 +855,7 @@ public void ImportModule(const char * name, ImportType importType, AccessMode im
                   strcpy(symFile, dir);
                   // PathCat(symFile, "Debug");
                   PathCat(symFile, "obj");
-                  sprintf(configDir, "debug.%s", (GetRuntimePlatform() == win32) ? "win32" : "linux");
+                  sprintf(configDir, "debug.%s", (__runtimePlatform == win32) ? "win32" : (__runtimePlatform == apple) ? "apple" : "linux");
                   PathCat(symFile, configDir);
 
                   PathCat(symFile, name);

diff --git a/compiler/libec/src/output.ec b/compiler/libec/src/output.ec
index f413ca6..cefa2cf 100644 (file)
--- a/compiler/libec/src/output.ec
+++ b/compiler/libec/src/output.ec
@@ -1528,7 +1528,7 @@ public void OutputTree(OldList ast, File f)
 {
    External external;
 
-   outputLine = 31;
+   outputLine = 38;
 
    for(external = ast.first; external; external = external.next)
    {

diff --git a/compiler/libec/src/pass15.ec b/compiler/libec/src/pass15.ec
index 1642e9f..f25421b 100644 (file)
--- a/compiler/libec/src/pass15.ec
+++ b/compiler/libec/src/pass15.ec
@@ -7824,7 +7824,13 @@ void ProcessExpressionType(Expression exp)
             exp.expType = ProcessTypeString("Module", true);
             break;
          }
-         else */if(strstr(id.string, "__ecereClass") == id.string)
+         else */
+         if(!strcmp(id.string, "__runtimePlatform"))
+         {
+            exp.expType = ProcessTypeString("ecere::com::Platform", true);
+            break;
+         }
+         else if(strstr(id.string, "__ecereClass") == id.string)
          {
             exp.expType = ProcessTypeString("ecere::com::Class", true);
             break;

diff --git a/documentor/src/Documentor.ec b/documentor/src/Documentor.ec
index 08e8cbd..a5e3d7e 100644 (file)
--- a/documentor/src/Documentor.ec
+++ b/documentor/src/Documentor.ec
@@ -3885,7 +3885,7 @@ class Documentor : GuiApplication
 {
    bool Init()
    {
-      Platform os = GetRuntimePlatform();
+      Platform os = __runtimePlatform;
       componentsApp = __ecere_COM_Initialize(false, 1, null);
       SetPrivateModule(componentsApp);
       SetGlobalContext(globalContext);

diff --git a/ecere/src/com/String.ec b/ecere/src/com/String.ec
index 9200a15..3af0514 100644 (file)
--- a/ecere/src/com/String.ec
+++ b/ecere/src/com/String.ec
@@ -30,8 +30,8 @@ default extern Platform runtimePlatform;
 
 #define IS_ALUNDER(ch) ((ch) == '_' || isalnum((ch)))
 
-public define DIR_SEP   = (GetRuntimePlatform() == win32) ? '\\' : '/';
-public define DIR_SEPS  = (GetRuntimePlatform() == win32) ? "\\" : "/";
+public define DIR_SEP   = (__runtimePlatform == win32) ? '\\' : '/';
+public define DIR_SEPS  = (__runtimePlatform == win32) ? "\\" : "/";
 
 // Maximum length for a vsnprintf string
 public define MAX_F_STRING = 1025;
@@ -226,7 +226,7 @@ public char * PathCatSlash(char * string, const char * addedPath)
          isURL = true;
          c = len;
       }
-      else if(GetRuntimePlatform() == win32)
+      else if(__runtimePlatform == win32)
       {
          if(addedPath[0] && addedPath[1] == ':' && addedPath[0] != '<')
          {
@@ -257,7 +257,7 @@ public char * PathCatSlash(char * string, const char * addedPath)
       }
       else if(!modified && (addedPath[0] == '\\' || addedPath[0] == '/'))
       {
-         if(GetRuntimePlatform() == win32)
+         if(__runtimePlatform == win32)
          {
             // Entire Computer
             if(addedPath[0] == '/' && !addedPath[1])
@@ -341,7 +341,7 @@ public char * PathCatSlash(char * string, const char * addedPath)
                   }
                   else
                   {
-                     if(GetRuntimePlatform() == win32)
+                     if(__runtimePlatform == win32)
                      {
                         if(!strLen && fileName[0] == '\\' && fileName[1] == '\\')
                         {

diff --git a/ecere/src/com/dataTypes.ec b/ecere/src/com/dataTypes.ec
index 1d0553d..21f5875 100644 (file)
--- a/ecere/src/com/dataTypes.ec
+++ b/ecere/src/com/dataTypes.ec
@@ -22,11 +22,11 @@ public define MAXFLOAT = 3.40282346638528860e+38f;
 public define MINDOUBLE = 2.2250738585072014e-308;
 public define MAXDOUBLE = 1.7976931348623158e+308;
 
-public define FORMAT64HEXLL  = (GetRuntimePlatform() == win32) ? "0x%I64XLL" : "0x%llXLL";
-public define FORMAT64HEX    = (GetRuntimePlatform() == win32) ? "0x%I64X" : "0x%llX";
-public define FORMAT64DLL    = (GetRuntimePlatform() == win32) ? "%I64dLL" : "%lldLL";
-public define FORMAT64D      = (GetRuntimePlatform() == win32) ? "%I64d" : "%lld";
-public define FORMAT64U      = (GetRuntimePlatform() == win32) ? "%I64u" : "%llu";
+public define FORMAT64HEXLL  = (__runtimePlatform == win32) ? "0x%I64XLL" : "0x%llXLL";
+public define FORMAT64HEX    = (__runtimePlatform == win32) ? "0x%I64X" : "0x%llX";
+public define FORMAT64DLL    = (__runtimePlatform == win32) ? "%I64dLL" : "%lldLL";
+public define FORMAT64D      = (__runtimePlatform == win32) ? "%I64d" : "%lld";
+public define FORMAT64U      = (__runtimePlatform == win32) ? "%I64u" : "%llu";
 
 #define PUTXWORD(b, w) \
    (b)[0] = (byte)(((w) >> 8) & 0xFF); \

diff --git a/ecere/src/com/instance.ec b/ecere/src/com/instance.ec
index de33aea..ef091c2 100644 (file)
--- a/ecere/src/com/instance.ec
+++ b/ecere/src/com/instance.ec
@@ -6223,7 +6223,7 @@ static void LoadCOM(Module module)
    eSystem_RegisterFunction("strcspn", "uintsize strcspn(const char *, const char *)", strcspn, module, baseSystemAccess);
    eSystem_RegisterFunction("strpbrk", "char * strpbrk(const char *, const char *)", strpbrk, module, baseSystemAccess);
 
-   eSystem_RegisterDefine("fstrcmp", "(GetRuntimePlatform() == win32) ? strcmpi : strcmp", module, baseSystemAccess);
+   eSystem_RegisterDefine("fstrcmp", "(__runtimePlatform == win32) ? strcmpi : strcmp", module, baseSystemAccess);
 
 //#if defined(__GNUC__)
    eSystem_RegisterDefine("strcmpi", "strcasecmp", module, baseSystemAccess);

diff --git a/epj2make/epj2make.ec b/epj2make/epj2make.ec
index 6a26ccc..5bb0e25 100644 (file)
--- a/epj2make/epj2make.ec
+++ b/epj2make/epj2make.ec
@@ -42,8 +42,6 @@ class epj2makeApp : GuiApplication
       int argc = 0;
       */
 
-      Platform targetPlatform = GetRuntimePlatform();
-
       Project project = null;
 
       CompilerConfig optionsCompiler { };
@@ -167,8 +165,8 @@ class epj2makeApp : GuiApplication
             }
             else if(arg[1] == 't' && !arg[2])
             {
-               if(++c < argc)
-                  targetPlatform = argv[c];
+               // Obsolete target platform option
+               if(++c < argc);
                else
                   valid = false;
             }

diff --git a/ide/src/IDESettings.ec b/ide/src/IDESettings.ec
index dac321a..cee930b 100644 (file)
--- a/ide/src/IDESettings.ec
+++ b/ide/src/IDESettings.ec
@@ -208,7 +208,7 @@ CompilerConfig MakeDefaultCompiler(const char * name, bool readOnly)
       name,
       readOnly,
       gcc,
-      GetRuntimePlatform(),
+      __runtimePlatform,
       1,
       makeDefaultCommand,
       ecpDefaultCommand,

diff --git a/ide/src/OldIDESettings.ec b/ide/src/OldIDESettings.ec
index 308576a..8359f01 100644 (file)
--- a/ide/src/OldIDESettings.ec
+++ b/ide/src/OldIDESettings.ec
@@ -19,7 +19,7 @@ define projectOptions = "Project Options";
 define defaultTargetDir = "Default Target Directory";
 define defaultIntermediateObjDir = "Default Intermediate Objects Directory";
 
-define makeDefaultCommand = (GetRuntimePlatform() == win32) ? "mingw32-make" :
+define makeDefaultCommand = (__runtimePlatform == win32) ? "mingw32-make" :
 #ifdef __FreeBSD__
    "gmake";
 #else
@@ -148,7 +148,7 @@ class OldIDESettings : GlobalAppSettings
                compiler = CompilerConfig { name = configName, targetPlatform = platformName };
                incref compiler;
                if(!compiler.targetPlatform)
-                  compiler.targetPlatform = GetRuntimePlatform();
+                  compiler.targetPlatform = __runtimePlatform;
                delete platformName;
                // TOCHECK these must call the property!
                GetGlobalValue(section, makeCommandSetting, singleString, &v); compiler.makeCommand = v && v[0] ? v : makeDefaultCommand; delete v;

diff --git a/ide/src/debugger/Debugger.ec b/ide/src/debugger/Debugger.ec
index 6feb9e0..9eeeb51 100644 (file)
--- a/ide/src/debugger/Debugger.ec
+++ b/ide/src/debugger/Debugger.ec
@@ -3053,9 +3053,9 @@ class Debugger
                            // snprintf(value, sizeof(value), "0x%08x ", address);
 
                            if(address > 0xFFFFFFFFLL)
-                              snprintf(value, sizeof(value), (GetRuntimePlatform() == win32) ? "0x%016I64x " : "0x%016llx ", address);
+                              snprintf(value, sizeof(value), (__runtimePlatform == win32) ? "0x%016I64x " : "0x%016llx ", address);
                            else
-                              snprintf(value, sizeof(value), (GetRuntimePlatform() == win32) ? "0x%08I64x " : "0x%08llx ", address);
+                              snprintf(value, sizeof(value), (__runtimePlatform == win32) ? "0x%08I64x " : "0x%08llx ", address);
                            value[sizeof(value)-1] = 0;
 
                            if(!address)
@@ -3320,11 +3320,8 @@ class Debugger
       if(!size)
          _dpl(0, "GdbReadMemoryString called with size = 0!");
 #endif
-      // GdbCommand(0, false, "-data-read-memory 0x%08x %c, %d, %d, %d", address, format, size, rows, cols);
-      if(GetRuntimePlatform() == win32)
-         GdbCommand(0, false, "-data-read-memory 0x%016I64x %c, %d, %d, %d", address, format, size, rows, cols);
-      else
-         GdbCommand(0, false, "-data-read-memory 0x%016llx %c, %d, %d, %d", address, format, size, rows, cols);
+      GdbCommand(0, false,
+         (__runtimePlatform == win32) ? "-data-read-memory 0x%016I64x %c, %d, %d, %d" : "-data-read-memory 0x%016llx %c, %d, %d, %d", address, format, size, rows, cols);
       if(eval.active)
          ide.outputView.debugBox.Logf("Debugger Error: GdbReadMemoryString\n");
       return eval.result;
@@ -3335,11 +3332,9 @@ class Debugger
       _dpl2(_dpct, dplchan::debuggerCall, 0, "Debugger::GdbReadMemory(", address, ")");
       eval.active = true;
       eval.error = none;
-      //GdbCommand(0, false, "-data-read-memory 0x%08x %c, 1, 1, %d", address, 'u', bytes);
-      if(GetRuntimePlatform() == win32)
-         GdbCommand(0, false, "-data-read-memory 0x%016I64x %c, 1, 1, %d", address, 'u', bytes);
-      else
-         GdbCommand(0, false, "-data-read-memory 0x%016llx %c, 1, 1, %d", address, 'u', bytes);
+      GdbCommand(0, false,
+         (__runtimePlatform == win32) ? "-data-read-memory 0x%016I64x %c, 1, 1, %d" : "-data-read-memory 0x%016llx %c, 1, 1, %d",
+         address, 'u', bytes);
 #ifdef _DEBUG
       if(!bytes)
          _dpl(0, "GdbReadMemory called with bytes = 0!");

diff --git a/ide/src/designer/CodeEditor.ec b/ide/src/designer/CodeEditor.ec
index b8a44c4..4625601 100644 (file)
--- a/ide/src/designer/CodeEditor.ec
+++ b/ide/src/designer/CodeEditor.ec
@@ -2930,7 +2930,7 @@ class CodeEditor : Window
       }
       else
       {
-         switch(GetRuntimePlatform())
+         switch(__runtimePlatform)
          {
             case win32: SetSymbolsDir("obj/debug.win32"); break;
             case tux:   SetSymbolsDir("obj/debug.linux"); break;

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index cbaf21e..87e3ec2 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -1260,7 +1260,7 @@ private:
                strcat(string, ".dylib");
             else
                strcat(string, ".so");
-            if(compiler.targetPlatform == tux && GetRuntimePlatform() == tux && moduleVersion && moduleVersion[0])
+            if(compiler.targetPlatform == tux && __runtimePlatform == tux && moduleVersion && moduleVersion[0])
             {
                strcat(string, ".");
                strcat(string, moduleVersion);
@@ -1998,7 +1998,7 @@ private:
       char configName[MAX_LOCATION];
       DirExpression objDirExp = GetObjDir(compiler, config, bitDepth);
       PathBackup pathBackup { };
-      bool crossCompiling = (compiler.targetPlatform != GetRuntimePlatform());
+      bool crossCompiling = (compiler.targetPlatform != __runtimePlatform);
       const char * targetPlatform = crossCompiling ? (char *)compiler.targetPlatform : "";
 
       bool eC_Debug = mode.eC_ToolsDebug;
@@ -2193,7 +2193,7 @@ private:
       char * compilerName;
       DualPipe f;
       PathBackup pathBackup { };
-      bool crossCompiling = (compiler.targetPlatform != GetRuntimePlatform());
+      bool crossCompiling = (compiler.targetPlatform != __runtimePlatform);
       const char * targetPlatform = crossCompiling ? (char *)compiler.targetPlatform : "";
 
       compilerName = CopyString(compiler.name);