From 202b29d49ef4a60bb3d616be9a26685e756dbaa4 Mon Sep 17 00:00:00 2001
From: retro-wertz <retro-wertz@users.noreply.github.com>
Date: Fri, 2 Aug 2019 19:02:52 +0800
Subject: [PATCH] Rename PACKAGE_VERSION to PCSX_VERSION

- this should silence warning for another PACKAGE_VERSION define used for flac
- PACKAGE_VERSION is not used within pcsx other than version logging. Savestate does not check for this and is using another define for savestate version number.
---
 include/config.h     | 2 +-
 libpcsxcore/debug.c  | 2 +-
 libpcsxcore/misc.c   | 2 +-
 libpcsxcore/r3000a.c | 2 +-
 libpcsxcore/socket.c | 2 +-
 maemo/main.c         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/config.h b/include/config.h
index ce2f3ea1..362e4a4c 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,2 +1,2 @@
 #define MAXPATHLEN 256
-#define PACKAGE_VERSION "1.9"
+#define PCSX_VERSION "1.9"
diff --git a/libpcsxcore/debug.c b/libpcsxcore/debug.c
index 763dc453..4ba7f570 100644
--- a/libpcsxcore/debug.c
+++ b/libpcsxcore/debug.c
@@ -445,7 +445,7 @@ static void ProcessCommands() {
             sprintf(reply, "200 %s\r\n", arguments == NULL ? "OK" : arguments);
             break;
         case 0x101:
-            sprintf(reply, "201 %s\r\n", PACKAGE_VERSION);
+            sprintf(reply, "201 %s\r\n", PCSX_VERSION);
             break;
         case 0x102:
             sprintf(reply, "202 1.0\r\n");
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index bb34e5bd..433d4be5 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -557,7 +557,7 @@ struct PcsxSaveFuncs SaveFuncs = {
 	zlib_open, zlib_read, zlib_write, zlib_seek, zlib_close
 };
 
-static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION;
+static const char PcsxHeader[32] = "STv4 PCSX v" PCSX_VERSION;
 
 // Savestate Versioning!
 // If you make changes to the savestate version, please increment the value below.
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 22341c54..0433c207 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -30,7 +30,7 @@ R3000Acpu *psxCpu = NULL;
 psxRegisters psxRegs;
 
 int psxInit() {
-	SysPrintf(_("Running PCSX Version %s (%s).\n"), PACKAGE_VERSION, __DATE__);
+	SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__);
 
 #ifdef PSXREC
 	if (Config.Cpu == CPU_INTERPRETER) {
diff --git a/libpcsxcore/socket.c b/libpcsxcore/socket.c
index c408bc32..df768e68 100644
--- a/libpcsxcore/socket.c
+++ b/libpcsxcore/socket.c
@@ -135,7 +135,7 @@ void GetClient() {
     }
 #endif
 
-    sprintf(hello, "000 PCSX Version %s - Debug console\r\n", PACKAGE_VERSION);
+    sprintf(hello, "000 PCSX Version %s - Debug console\r\n", PCSX_VERSION);
     WriteSocket(hello, strlen(hello));
     ptr = 0;
 }
diff --git a/maemo/main.c b/maemo/main.c
index c382c511..50e129ec 100644
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -54,7 +54,7 @@ static void ChangeWorkingDirectory(char *exe)
 
 void PrintHelp()
 {
-	printf("PCSX-ReARMed version %s for Maemo\n\n", PACKAGE_VERSION);
+	printf("PCSX-ReARMed version %s for Maemo\n\n", PCSX_VERSION);
 
 	printf("Usage:\n");
 	printf("  pcsx [options] -cdfile FILE\n\n");
-- 
2.39.5