diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/stdbool.h | 25 | ||||
-rw-r--r-- | uisimulator/win32/string-win32.c | 6 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.c | 6 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.rc | 4 |
4 files changed, 38 insertions, 3 deletions
diff --git a/uisimulator/win32/stdbool.h b/uisimulator/win32/stdbool.h index 769d7ac709..d91ef374b9 100644 --- a/uisimulator/win32/stdbool.h +++ b/uisimulator/win32/stdbool.h | |||
@@ -17,7 +17,30 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #ifndef __STDBOOL_H__ | ||
21 | #define __STDBOOL_H__ 1 | ||
22 | |||
23 | #ifndef __MINGW32__ | ||
20 | typedef unsigned int bool; | 24 | typedef unsigned int bool; |
25 | #define __attribute__(s) | ||
26 | |||
21 | #define true 1 | 27 | #define true 1 |
22 | #define false 0 | 28 | #define false 0 |
23 | #define __attribute__(s) \ No newline at end of file | 29 | #else |
30 | |||
31 | typedef enum | ||
32 | { | ||
33 | false = 0, | ||
34 | true = 1 | ||
35 | } bool; | ||
36 | |||
37 | #define false false | ||
38 | #define true true | ||
39 | |||
40 | /* Signal that all the definitions are present. */ | ||
41 | #define __bool_true_false_are_defined 1 | ||
42 | |||
43 | #endif | ||
44 | |||
45 | #endif /* __STDBOOL_H__ */ | ||
46 | |||
diff --git a/uisimulator/win32/string-win32.c b/uisimulator/win32/string-win32.c index 9e10f0ed66..bf81fd1839 100644 --- a/uisimulator/win32/string-win32.c +++ b/uisimulator/win32/string-win32.c | |||
@@ -17,6 +17,8 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #ifndef __MINGW32__ | ||
21 | |||
20 | #include <string.h> | 22 | #include <string.h> |
21 | 23 | ||
22 | int strcasecmp (const char *a, const char *b) | 24 | int strcasecmp (const char *a, const char *b) |
@@ -27,4 +29,6 @@ int strcasecmp (const char *a, const char *b) | |||
27 | int strncasecmp (const char *a, const char *b) | 29 | int strncasecmp (const char *a, const char *b) |
28 | { | 30 | { |
29 | return strcmpi (a, b); | 31 | return strcmpi (a, b); |
30 | } \ No newline at end of file | 32 | } |
33 | |||
34 | #endif | ||
diff --git a/uisimulator/win32/uisw32.c b/uisimulator/win32/uisw32.c index 2661d74cb0..a491dec7db 100644 --- a/uisimulator/win32/uisw32.c +++ b/uisimulator/win32/uisw32.c | |||
@@ -26,6 +26,10 @@ | |||
26 | #include "thread-win32.h" | 26 | #include "thread-win32.h" |
27 | #include "kernel.h" | 27 | #include "kernel.h" |
28 | 28 | ||
29 | #ifndef LR_VGACOLOR /* Should be under MINGW32 builds? */ | ||
30 | #define LR_VGACOLOR LR_COLOR | ||
31 | #endif | ||
32 | |||
29 | // extern functions | 33 | // extern functions |
30 | extern void app_main (void *); // mod entry point | 34 | extern void app_main (void *); // mod entry point |
31 | extern void new_key(int key); | 35 | extern void new_key(int key); |
@@ -298,4 +302,4 @@ int WINAPI WinMain ( | |||
298 | GUIMessageLoop (); | 302 | GUIMessageLoop (); |
299 | 303 | ||
300 | return GUIDown (); | 304 | return GUIDown (); |
301 | } \ No newline at end of file | 305 | } |
diff --git a/uisimulator/win32/uisw32.rc b/uisimulator/win32/uisw32.rc index 42f5e6f0a7..6787c26b7e 100644 --- a/uisimulator/win32/uisw32.rc +++ b/uisimulator/win32/uisw32.rc | |||
@@ -7,7 +7,9 @@ | |||
7 | // | 7 | // |
8 | // Generated from the TEXTINCLUDE 2 resource. | 8 | // Generated from the TEXTINCLUDE 2 resource. |
9 | // | 9 | // |
10 | #ifndef __MINGW32__ | ||
10 | #include "afxres.h" | 11 | #include "afxres.h" |
12 | #endif | ||
11 | 13 | ||
12 | ///////////////////////////////////////////////////////////////////////////// | 14 | ///////////////////////////////////////////////////////////////////////////// |
13 | #undef APSTUDIO_READONLY_SYMBOLS | 15 | #undef APSTUDIO_READONLY_SYMBOLS |
@@ -17,7 +19,9 @@ | |||
17 | 19 | ||
18 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) | 20 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) |
19 | #ifdef _WIN32 | 21 | #ifdef _WIN32 |
22 | #ifndef __MINGW32__ | ||
20 | LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US | 23 | LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US |
24 | #endif | ||
21 | #pragma code_page(1252) | 25 | #pragma code_page(1252) |
22 | #endif //_WIN32 | 26 | #endif //_WIN32 |
23 | 27 | ||