scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 04:31:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Trunk Sync - r6865

Browse Source
This commit is contained in:
Zacam committed 2010-12-19 06:05:54 +00:00
1 parent 0edd54cf19
commit 34e02ce943
6 files changed
+35 -88
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/cryptstring/cryptstring.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "globalincs/crypt.h"
// we end up #include'ing SDL.h which on Windows and Mac will redfine main() which is something
// we end up #include'ing SDL.h which on Windows and Mac will redefine main() which is something
// that we don't want since we don't actually link against SDL, this solves the problem...
#ifdef main
#undef main