Skip to content

Commit 7b621b7

Browse files
committed
Attempt to fix a duplicate symbol.
Prevents compiling on Mac OS X
1 parent 1e47ea5 commit 7b621b7

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

code/qcommon/q_shared.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,3 +1447,6 @@ char *Com_SkipTokens( char *s, int numTokens, char *sep )
14471447
else
14481448
return s;
14491449
}
1450+
1451+
int vresWidth;
1452+
int vresHeight;

code/qcommon/q_shared.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,8 +1403,8 @@ typedef enum _flag_status {
14031403

14041404

14051405
// leilei - virtual res
1406-
int vresWidth;
1407-
int vresHeight;
1406+
extern int vresWidth;
1407+
extern int vresHeight;
14081408

14091409
#define MAX_GLOBAL_SERVERS 4096
14101410
#define MAX_OTHER_SERVERS 128

0 commit comments

Comments
 (0)