outGUID returns a const string, so making it return const TCHAR *

diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp
index f58a1b33e1264dbc3a59fe506037a372fd5e3a72..355c3013e166f11579a29362e10ff51e0f449c7c 100644 (file)
--- a/od-win32/dinput.cpp
+++ b/od-win32/dinput.cpp
@@ -1168,7 +1168,7 @@ static void rawinputfriendlynames (void)
                                if (SetupDiGetDeviceInstanceId (di, &dd, devpath, sizeof devpath / sizeof(TCHAR), &size)) {
                                        DEVINST devinst = dd.DevInst;
 
-                                       TCHAR *cg = outGUID (&guid[ii]);
+                                       const TCHAR *cg = outGUID (&guid[ii]);
                                        for (;;) {
                                                TCHAR devname[MAX_DPATH];
                                                ULONG size2;

diff --git a/od-win32/render.h b/od-win32/render.h
index d3120f60eb9a05aa1966445b4bb020d9fe3a6063..ad5c5e634669dfd9b3377315dec002e6a55380d9 100644 (file)
--- a/od-win32/render.h
+++ b/od-win32/render.h
@@ -110,6 +110,6 @@ typedef enum
 } DirectDraw_Mask_e;
 
 extern const TCHAR *DXError(HRESULT hr);
-extern TCHAR *outGUID (const GUID *guid);
+extern const TCHAR *outGUID (const GUID *guid);
 
 #endif

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 239a4b133395ba7360ef10f8ca552df36f87c627..3a37626dac815773fbb40c94b208eb922258b97a 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -4266,7 +4266,7 @@ void releasehdc(int monid, HDC hdc)
        }
 }
 
-TCHAR *outGUID(const GUID *guid)
+const TCHAR *outGUID(const GUID *guid)
 {
        static TCHAR gb[64];
        if (guid == NULL)