Merge remote-tracking branch 'github/master'

[xonotic/netradiant.git] / tools / quake3 / common / cmdlib.h

diff --git a/tools/quake3/common/cmdlib.h b/tools/quake3/common/cmdlib.h
index 3fb98febc98457d9438a089882a41f937dfa0f6d..f6f5e4d17106108c173a13e8e15cd53e32fb3e9d 100644 (file)
--- a/tools/quake3/common/cmdlib.h
+++ b/tools/quake3/common/cmdlib.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -53,7 +53,11 @@
 #endif
 
 
+#ifdef PATH_MAX
+#define MAX_OS_PATH     PATH_MAX
+#else
 #define MAX_OS_PATH     4096
+#endif
 #define MEM_BLOCKSIZE 4096
 
 // the dec offsetof macro doesnt work very well...
@@ -95,7 +99,11 @@ void ExpandWildcards( int *argc, char ***argv );
 
 double I_FloatTime( void );
 
-void    Error( const char *error, ... );
+void    Error( const char *error, ... )
+#ifdef __GNUC__
+__attribute__( ( noreturn ) )
+#endif
+;
 int     CheckParm( const char *check );
 
 FILE    *SafeOpenWrite( const char *filename );