From ae0577bc1644dc76719eec659932ac262054c196 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Wed, 26 Oct 2016 17:31:26 +0100 Subject: [PATCH] cdvdgigaherz: Fix write-strings warnings Too bad I can't change PS2Edef.h to use a const char*. Also remove SVN_MOD ifdef from version string. --- plugins/cdvdGigaherz/src/CDVD.cpp | 10 +++------- plugins/cdvdGigaherz/src/ReadThread.cpp | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/cdvdGigaherz/src/CDVD.cpp b/plugins/cdvdGigaherz/src/CDVD.cpp index 8d43eb1b43..28090461a2 100644 --- a/plugins/cdvdGigaherz/src/CDVD.cpp +++ b/plugins/cdvdGigaherz/src/CDVD.cpp @@ -50,15 +50,11 @@ int cmode; /////////////////////////////////////////////////////////////////////////////// // Plugin Interface // -char *LibName = "cdvdGigaherz " +char LibName[] = "cdvdGigaherz " #ifdef PCSX2_DEBUG - " Debug " + " Debug " #endif - "(" TOSTR(SVN_REV) -#if SVN_MODS - "/modded" -#endif - ")"; + "(" TOSTR(SVN_REV) ")"; const unsigned char version = PS2E_CDVD_VERSION; const unsigned char revision = 0; diff --git a/plugins/cdvdGigaherz/src/ReadThread.cpp b/plugins/cdvdGigaherz/src/ReadThread.cpp index 7d0e79e1d1..f53c62b85c 100644 --- a/plugins/cdvdGigaherz/src/ReadThread.cpp +++ b/plugins/cdvdGigaherz/src/ReadThread.cpp @@ -333,7 +333,7 @@ s32 cdvdGetMediaType() s32 cdvdRefreshData() { - char *diskTypeName = "Unknown"; + const char *diskTypeName = "Unknown"; //read TOC from device cdvdParseTOC();