Commit 2da830a90975287a8e5d532845cb7baf5da484a9
2017-08-13T21:15:44
Fixed bug 3741 - more compatible initializers for arrays Ozkan Sezer An array defined like int xPositions[] = {-1, 0, 1, w-1, w, w+1 }; errors with Open Watcom: it strictly wants constants. Small patch like below makes things more compatible.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/test/testautomation_mouse.c b/test/testautomation_mouse.c
index 57cadee..ed30f26 100644
--- a/test/testautomation_mouse.c
+++ b/test/testautomation_mouse.c
@@ -447,11 +447,23 @@ mouse_warpMouseInWindow(void *arg)
{
const int w = MOUSE_TESTWINDOW_WIDTH, h = MOUSE_TESTWINDOW_HEIGHT;
int numPositions = 6;
- int xPositions[] = {-1, 0, 1, w-1, w, w+1 };
- int yPositions[] = {-1, 0, 1, h-1, h, h+1 };
+ int xPositions[6];
+ int yPositions[6];
int x, y, i, j;
SDL_Window *window;
+ xPositions[0] = -1;
+ xPositions[1] = 0;
+ xPositions[2] = 1;
+ xPositions[3] = w-1;
+ xPositions[4] = w;
+ xPositions[5] = w+1;
+ yPositions[0] = -1;
+ yPositions[1] = 0;
+ yPositions[2] = 1;
+ yPositions[3] = h-1;
+ yPositions[4] = h;
+ yPositions[5] = h+1;
/* Create test window */
window = _createMouseSuiteTestWindow();
if (window == NULL) return TEST_ABORTED;
diff --git a/test/testmessage.c b/test/testmessage.c
index 27407ba..07d0b03 100644
--- a/test/testmessage.c
+++ b/test/testmessage.c
@@ -46,12 +46,13 @@ button_messagebox(void *eventNumber)
"Custom MessageBox",
"This is a custom messagebox",
2,
- buttons,
+ NULL,/* buttons */
NULL /* Default color scheme */
};
int button = -1;
int success = 0;
+ data.buttons = buttons;
if (eventNumber) {
data.message = "This is a custom messagebox from a background thread.";
}