From ea1eae3dd9c81adc3fe6af7add3577240dcf094d Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Wed, 16 May 2007 21:03:02 +0000 Subject: [PATCH] Fixing a msvc7 comping issue svn path=/trunk/; revision=26814 --- rostests/dxtest/ddraw/ddraw.rbuild | 2 +- rostests/dxtest/ddraw/{ddraw_test.c => ddraw_test.cpp} | 2 +- rostests/dxtest/ddraw/testlist.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename rostests/dxtest/ddraw/{ddraw_test.c => ddraw_test.cpp} (95%) diff --git a/rostests/dxtest/ddraw/ddraw.rbuild b/rostests/dxtest/ddraw/ddraw.rbuild index 5829f25c05e..5077d7362cd 100644 --- a/rostests/dxtest/ddraw/ddraw.rbuild +++ b/rostests/dxtest/ddraw/ddraw.rbuild @@ -7,6 +7,6 @@ gdi32 ddraw dxguid - ddraw_test.c + ddraw_test.cpp testlist.cpp diff --git a/rostests/dxtest/ddraw/ddraw_test.c b/rostests/dxtest/ddraw/ddraw_test.cpp similarity index 95% rename from rostests/dxtest/ddraw/ddraw_test.c rename to rostests/dxtest/ddraw/ddraw_test.cpp index 608a4ac8fa1..ba6a03df302 100644 --- a/rostests/dxtest/ddraw/ddraw_test.c +++ b/rostests/dxtest/ddraw/ddraw_test.cpp @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) { for (j = 0; j < NumTests(); j++) { - if (stricmp(argv[i], TestList[j].Test) == 0) + if (_stricmp(argv[i], TestList[j].Test) == 0) { passed = 0; failed = 0; diff --git a/rostests/dxtest/ddraw/testlist.cpp b/rostests/dxtest/ddraw/testlist.cpp index 84b85d7bece..32f2ae969aa 100644 --- a/rostests/dxtest/ddraw/testlist.cpp +++ b/rostests/dxtest/ddraw/testlist.cpp @@ -19,7 +19,7 @@ TEST TestList[] = }; /* The function that gives us the number of tests */ -extern "C" INT NumTests(void) +INT NumTests(void) { return sizeof(TestList) / sizeof(TEST); }