From 4b5aff926d9a32d24e49ef744837e616b8fd91cf Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Mon, 17 Jan 2005 10:20:47 +0000 Subject: [PATCH] Fixed compilation errors This was SVN commit r1731. --- source/ps/Network/Client.cpp | 2 +- source/ps/XMLWriter.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source/ps/Network/Client.cpp b/source/ps/Network/Client.cpp index 5eda7c5269..e7107b4aee 100755 --- a/source/ps/Network/Client.cpp +++ b/source/ps/Network/Client.cpp @@ -11,7 +11,7 @@ #define LOG_CAT_NET "net" CNetClient *g_NetClient=NULL; -extern int fps; +extern "C" int fps; extern CConsole *g_Console; enum CClientEvents diff --git a/source/ps/XMLWriter.cpp b/source/ps/XMLWriter.cpp index e94ff9cc3f..eda6d98b26 100644 --- a/source/ps/XMLWriter.cpp +++ b/source/ps/XMLWriter.cpp @@ -142,7 +142,6 @@ template <> void XMLWriter_File::ElementAttribute(const char* name, CStr& } } -#ifdef __GNUC__ // (Simon) Since GCC refuses to pass temporaries through non-const reference, // define this wrapper function to convert [ugly] a const CStr to a non-const template <> @@ -150,7 +149,6 @@ inline void XMLWriter_File::ElementAttribute(const char *name, const { ElementAttribute(name, (CStr &)value, newelement); } -#endif // Attribute/setting value-to-string template specialisations: