From ba1dcead7c6c158b84fe870ba558c45dfe13eff7 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Fri, 2 Nov 2012 18:35:57 +0100 Subject: [PATCH] Moved vers_id.h inclusion to where it is needed - patch by Kp --- CHANGELOG.txt | 1 + main/menu.c | 1 + main/multi.h | 1 - main/net_udp.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3e5027958..7b7265062 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -10,6 +10,7 @@ main/object.h: use struct type explicitly - patch by Kp include/error.h: Renamed __format to __attribute_gcc_format due to possible C++ conflict; allow arguments - patch by Kp include/console.h, main/console.c: Marked con_printf fmt as const, Increased console lines from 512 to 2048; Marked console private entries as static - patches by Kp 2d/font.c: Fixed test for font magic number; Consolidated grs_font_read() - patches by Kp +main/menu.c, main/multi.h, main/net_udp.c: Moved vers_id.h inclusion to where it is needed - patch by Kp 20121031 -------- diff --git a/main/menu.c b/main/menu.c index 4208b7ddd..7f68c221d 100644 --- a/main/menu.c +++ b/main/menu.c @@ -66,6 +66,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "powerup.h" #include "strutil.h" #include "multi.h" +#include "vers_id.h" #ifdef USE_UDP #include "net_udp.h" #endif diff --git a/main/multi.h b/main/multi.h index 24ff547ec..7f42004ad 100644 --- a/main/multi.h +++ b/main/multi.h @@ -23,7 +23,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gameseq.h" #include "piggy.h" -#include "vers_id.h" #include "newmenu.h" #ifdef USE_UDP diff --git a/main/net_udp.c b/main/net_udp.c index 64d972b43..9b7e0499b 100644 --- a/main/net_udp.c +++ b/main/net_udp.c @@ -54,6 +54,7 @@ #include "gamefont.h" #include "rbaudio.h" #include "config.h" +#include "vers_id.h" // Prototypes void net_udp_init();