- Fix Greatlordisms:

* Don't try to link *user*mode program to static *kernelmode* libcntpr. msvcrt.dll exists for this.
* Fix main()'s declaration and definition.
* The above changes fix compiling of rostest module.

svn path=/trunk/; revision=31043

diff --git a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
index 8a3162e..7963453 100644 (file)
--- a/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
+++ b/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
@@ -5,7 +5,6 @@
        <library>kernel32</library>
        <library>gdi32</library>
        <library>ddraw</library>
-       <library>libcntpr</library>
        <library>user32</library>
        <file>main.c</file>
 </module>
\ No newline at end of file

diff --git a/rostests/tests/D3DParseUnknownCommand_show/main.c b/rostests/tests/D3DParseUnknownCommand_show/main.c
index c96d6c1..84a8142 100644 (file)
--- a/rostests/tests/D3DParseUnknownCommand_show/main.c
+++ b/rostests/tests/D3DParseUnknownCommand_show/main.c
@@ -22,10 +22,10 @@
  *
  */
 
-INT main(INT argc, CHAR argv[]);
+INT main(INT argc, TCHAR *argv[]);
 VOID BuildReturnCode(DWORD * ReturnCode);
 
-INT main(INT argc, TCHAR argv[])
+INT main(INT argc, TCHAR *argv[])
 {
     DWORD ReturnCode[256];
 
@@ -44,6 +44,6 @@ VOID BuildReturnCode(DWORD * ReturnCode)
     {
        dp2command.bCommand = t;
        ReturnCode[t] = D3DParseUnknownCommand ( (LPVOID) &dp2command, (LPVOID *) lplpvReturnedCommand) ;
-       printf("D3DParseUnknownCommand return code = %x command %d \n", ReturnCode[t], t);
+       printf("D3DParseUnknownCommand return code = %x command %d \n", (UINT)ReturnCode[t], t);
     }
 }