Giel van Schijndel schreef:
> Dennis Schridde schreef:
>   
>> Author: devurandom
>> Date: Sat Dec  2 13:50:28 2006
>> New Revision: 526
>>
>> URL: http://svn.gna.org/viewcvs/warzone?rev=526&view=rev
>> Log:
>> Patches by Christian Ohm:
>> 034 - Reorganized src-warcam.c
>> 036 - Cleanup includes and function declarations
>>
>> Modified:
>>     ..
>>     trunk/src/main.c
>>     ..
>>   
>>     
> The changes to main.c in this commit make it impossible to compile it on
> WIN32. The cause is that a conditional include wasn't being included
> anymore because the preprocessor variable isn't declared yet at the time
> of inclusion.
>
> So attached a patch to fix it.
I see the previous patch wasn't entirely complete (it copied a header
include directive rather than just moving it).
So the revised one is attached.

--
Giel
Index: src/main.c
===================================================================
--- src/main.c  (revision 534)
+++ src/main.c  (working copy)
@@ -7,12 +7,14 @@
 #include <physfs.h>
 #include <string.h>
 
+//Giel: this include defines WIN32
+#include "lib/framework/frame.h"
+
 /* For SHGetFolderPath */
 #ifdef WIN32
 # include <shlobj.h>
 #endif // WIN32
 
-#include "lib/framework/frame.h"
 #include "lib/framework/configfile.h"
 #include "lib/gamelib/gtime.h"
 #include "lib/ivis_common/piestate.h"

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev

Reply via email to