aboutsummaryrefslogtreecommitdiffstats
path: root/q3asm
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-10-04 01:49:02 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-10-04 01:49:02 +0000
commit91db83f0cc7c564ff6c853eeb4e790732dae81cd (patch)
treea7cc534b6649599c0422f52dbe3f648f9f560697 /q3asm
parent45d6a88841f0db650d615522b1f6594ea72ceb7e (diff)
downloadioquake3-aero-91db83f0cc7c564ff6c853eeb4e790732dae81cd.tar.gz
ioquake3-aero-91db83f0cc7c564ff6c853eeb4e790732dae81cd.zip
* lcc and q3asm now build with MinGW
git-svn-id: svn://svn.icculus.org/quake3/trunk@133 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'q3asm')
-rw-r--r--q3asm/cmdlib.c5
-rw-r--r--q3asm/cmdlib.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/q3asm/cmdlib.c b/q3asm/cmdlib.c
index 56c70c0..f3d8554 100644
--- a/q3asm/cmdlib.c
+++ b/q3asm/cmdlib.c
@@ -636,9 +636,10 @@ int Q_filelength (FILE *f)
return end;
}
-#ifndef MAXPATH
-#define MAX_PATH 4096
+#ifdef MAX_PATH
+#undef MAX_PATH
#endif
+#define MAX_PATH 4096
static FILE* myfopen(const char* filename, const char* mode)
{
char* p;
diff --git a/q3asm/cmdlib.h b/q3asm/cmdlib.h
index 0d7dfc3..f2436a1 100644
--- a/q3asm/cmdlib.h
+++ b/q3asm/cmdlib.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __CMDLIB__
#define __CMDLIB__
-#ifdef _WIN32
+#ifdef _MSC_VER
#pragma warning(disable : 4244) // MIPS
#pragma warning(disable : 4136) // X86
#pragma warning(disable : 4051) // ALPHA
@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <time.h>
#include <stdarg.h>
-#ifdef _WIN32
+#ifdef _MSC_VER
#pragma intrinsic( memset, memcpy )