#define MAX_FILENAME 274
#define MAX_EXTENSION 17
+#if defined(__MINGW32__) && !defined(_W64) && __GNUC__ < 4
+__declspec(dllexport) int isblank(int c) { return c == '\t' || c == ' '; }
+#endif
+
#if defined(__WIN32__)
intptr_t stdinHandle, stdoutHandle;
int osfStdin, osfStdout;
FILE * fStdIn, * fStdOut;
#endif
-FILE *eC_stdin(void) {
+FILE *eC_stdin(void) {
#if defined(__WIN32__)
if(!fStdIn)
{
void * __ecereNameSpace__ecere__com__eSystem_New0(unsigned int size);
void * __ecereNameSpace__ecere__com__eSystem_Renew(void * memory, unsigned int size);
void * __ecereNameSpace__ecere__com__eSystem_Renew0(void * memory, unsigned int size);
-unsigned short * __ecereNameSpace__ecere__sys__UTF8toUTF16(char * source, int * wordCount);
-unsigned short * __ecereNameSpace__ecere__sys__UTF8toUTF16Buffer(char * source, uint16 * dest, int max);
+unsigned short * __ecereNameSpace__ecere__sys__UTF8toUTF16(const char * source, int * wordCount);
+unsigned short * __ecereNameSpace__ecere__sys__UTF8toUTF16Buffer(const char * source, uint16 * dest, int max);
char * __ecereNameSpace__ecere__sys__UTF16toUTF8(uint16 * source);
-char * __ecereNameSpace__ecere__sys__UTF16toUTF8Buffer(uint16 * source, byte * dest, int max);
+char * __ecereNameSpace__ecere__sys__UTF16toUTF8Buffer(uint16 * source, char * dest, int max);
#define eSystem_Delete __ecereNameSpace__ecere__com__eSystem_Delete
#define eSystem_New0 __ecereNameSpace__ecere__com__eSystem_New0
#define forArgsPassing 2
int __ecereNameSpace__ecere__sys__Tokenize(char * string, int maxTokens, char* tokens[], int esc);
-char * __ecereNameSpace__ecere__sys__RSearchString(char * buffer, char * subStr, int maxLen, bool matchCase, bool matchWord);
-char * __ecereNameSpace__ecere__sys__GetLastDirectory(char * string, char * output);
-char * __ecereNameSpace__ecere__sys__PathCat(char * string, char * addedPath);
-char * __ecereNameSpace__ecere__sys__GetExtension(char * string, char * output);
+char * __ecereNameSpace__ecere__sys__RSearchString(const char * buffer, const char * subStr, int maxLen, bool matchCase, bool matchWord);
+char * __ecereNameSpace__ecere__sys__GetLastDirectory(const char * string, char * output);
+char * __ecereNameSpace__ecere__sys__PathCat(char * string, const char * addedPath);
+char * __ecereNameSpace__ecere__sys__GetExtension(const char * string, char * output);
#define Tokenize __ecereNameSpace__ecere__sys__Tokenize
#define RSearchString __ecereNameSpace__ecere__sys__RSearchString
result = false;
break;
}
- if(ch =='\n')
+ if(ch =='\n')
break;
if(ch !='\r')
s[c++]=(char)ch;
#endif
-bool Instance_LocateModule(char * name, char * fileName)
+bool Instance_LocateModule(const char * name, char * fileName)
{
#if defined(__WIN32__)
HMODULE hModule = null;
{
uint16 _wfileName[MAX_LOCATION];
GetModuleFileNameW(hModule, _wfileName, MAX_LOCATION);
- UTF16toUTF8Buffer(_wfileName, (byte *)fileName, MAX_LOCATION);
+ UTF16toUTF8Buffer(_wfileName, fileName, MAX_LOCATION);
return true;
}
}
{
uint16 _wfileName[MAX_LOCATION];
GetModuleFileNameW(null, _wfileName, MAX_LOCATION);
- UTF16toUTF8Buffer(_wfileName, (byte *)fileName, MAX_LOCATION);
+ UTF16toUTF8Buffer(_wfileName, fileName, MAX_LOCATION);
return true;
}
#elif defined(__APPLE__)
sysctl(mib, 4, fileName, &cb, null, 0);
if(fileName[0])
return true;
- }
+ }
#endif
#if !defined(__linux__)
{
return false;
}
-void Instance_COM_Initialize(int argc, char ** argv, char ** parsedCommand, int * argcPtr, char *** argvPtr)
+void Instance_COM_Initialize(int argc, char ** argv, char ** parsedCommand, int * argcPtr, const char *** argvPtr)
{
#if !defined(__WIN32__) && !defined(ECERE_BOOTSTRAP)
// Disable stdout buffering on Unix
*argcPtr = Tokenize(*parsedCommand, 512,(void*)(char **)(*argvPtr), forArgsPassing);
#else
*argcPtr = argc;
- *argvPtr = argv;
+ *argvPtr = (const char **)argv;
#endif
#if defined(__unix__)
if(!__thisModule && argv)
{
- getcwd(exeLocation, MAX_LOCATION);
+ if(!getcwd(exeLocation, MAX_LOCATION))
+ exeLocation[0] = 0;
PathCat(exeLocation, argv[0]);
}
#endif
FreeLibrary(library);
}
#elif defined(__unix__) || defined(__APPLE__)
- if(libLocation)
- strcpy(fileName, libLocation);
+ if(libLocation || strchr(name, '/'))
+ strcpy(fileName, libLocation ? libLocation : "");
else
strcpy(fileName, "lib");
strcat(fileName, name);
dlclose(library);
}
#elif defined(__APPLE__)
- strcpy(fileName, "lib");
+ if(libLocation || strchr(name, '/'))
+ strcpy(fileName, libLocation ? libLocation : "");
+ else
+ strcpy(fileName, "lib");
strcat(fileName, name);
GetExtension(fileName, extension);
if(!extension[0])
if(returnCode == NSObjectFileImageSuccess)
{
printf("NSObjectFileImageSuccess!\n");
- library = NSLinkModule(fileImage,fileName,
+ library = NSLinkModule(fileImage,fileName,
NSLINKMODULE_OPTION_RETURN_ON_ERROR
| NSLINKMODULE_OPTION_PRIVATE);
// NSDestroyObjectFileImage(fileImage);
if(library)
{
- *Load = NSAddressOfSymbol(NSLookupSymbolInModule(library, "__ecereDll_Load"));
+ *Load = NSAddressOfSymbol(NSLookupSymbolInModule(library, "__ecereDll_Load"));
*Unload = NSAddressOfSymbol(NSLookupSymbolInModule(library, "__ecereDll_Unload"));
if(!*Load)
{
{
}
#endif
+
+#include <math.h>
+
+bool Float_isNan(float n) { return isnan(n); }
+bool Float_isInf(float n) { return isinf(n); }
+int Float_signBit(float n) { return signbit(n); }
+float Float_nan(void) { return NAN; }
+float Float_inf(void) { return INFINITY; }
+
+bool Double_isNan(double n) { return isnan(n); }
+bool Double_isInf(double n) { return isinf(n); }
+int Double_signBit(double n) { return signbit(n); }
+double Double_nan(void) { return NAN; }
+double Double_inf(void) { return INFINITY; }