From e60db3ccb5d60bb88a9e966a2746e88848501862 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Sun, 26 Nov 2017 09:09:38 +0100
Subject: [PATCH] adjust names

---
 inc/debug.h   |  6 +++---
 src/main.c    |  2 +-
 src/palette.c |  2 +-
 src/surface.c | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/inc/debug.h b/inc/debug.h
index eb961e9..89a91ae 100644
--- a/inc/debug.h
+++ b/inc/debug.h
@@ -8,14 +8,14 @@ void DebugPrint(const char *format, ...);
 //#define _DEBUG 1
 
 //use OutputDebugStringA rather than printf
-//#define _DEBUGstring 1
+//#define _DEBUG_S 1
 
 //log everything (slow)
-//#define _DEBUGx 1
+//#define _DEBUG_X 1
 
 #ifdef _DEBUG
 
-#ifdef _DEBUGstring
+#ifdef _DEBUG_S
 #define printf(format, ...) DebugPrint("xDBG " format, ##__VA_ARGS__)
 #endif 
 
diff --git a/src/main.c b/src/main.c
index 0efcb6a..96a7847 100644
--- a/src/main.c
+++ b/src/main.c
@@ -702,7 +702,7 @@ HRESULT __stdcall ddraw_SetCooperativeLevel(IDirectDrawImpl *This, HWND hWnd, DW
 
 HRESULT __stdcall ddraw_WaitForVerticalBlank(IDirectDrawImpl *This, DWORD a, HANDLE b)
 {
-#if _DEBUGx
+#if _DEBUG_X
     printf("DirectDraw::WaitForVerticalBlank(This=%p, ...)\n", This);
 #endif
     return DD_OK;
diff --git a/src/palette.c b/src/palette.c
index 6991403..d7e6bd5 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -42,7 +42,7 @@ HRESULT __stdcall ddraw_palette_SetEntries(IDirectDrawPaletteImpl *This, DWORD d
 {
     int i;
 
-#if _DEBUGx
+#if _DEBUG_X
     printf("DirectDrawPalette::SetEntries(This=%p, dwFlags=%d, dwStartingEntry=%d, dwCount=%d, lpEntries=%p)\n", This, (int)dwFlags, (int)dwStartingEntry, (int)dwCount, lpEntries);
 #endif
 
diff --git a/src/surface.c b/src/surface.c
index c4ceb2a..3dbab68 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -81,7 +81,7 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR
 {
     IDirectDrawSurfaceImpl *Source = (IDirectDrawSurfaceImpl *)lpDDSrcSurface;
 
-#if _DEBUGx
+#if _DEBUG_X
     printf("DirectDrawSurface::Blt(This=%p, lpDestRect=%p, lpDDSrcSurface=%p, lpSrcRect=%p, dwFlags=%d, lpDDBltFx=%p)\n", This, lpDestRect, lpDDSrcSurface, lpSrcRect, (int)dwFlags, lpDDBltFx);
     if(lpDestRect)
     {
@@ -151,7 +151,7 @@ HRESULT __stdcall ddraw_surface_DeleteAttachedSurface(IDirectDrawSurfaceImpl *Th
 
 HRESULT __stdcall ddraw_surface_GetSurfaceDesc(IDirectDrawSurfaceImpl *This, LPDDSURFACEDESC lpDDSurfaceDesc)
 {
-#if _DEBUGx
+#if DEBUG_X
     printf("IDirectDrawSurface::GetSurfaceDesc(This=%p, lpDDSurfaceDesc=%p)\n", This, lpDDSurfaceDesc);
 #endif
 
@@ -197,7 +197,7 @@ HRESULT __stdcall ddraw_surface_EnumOverlayZOrders(IDirectDrawSurfaceImpl *This,
 
 HRESULT __stdcall ddraw_surface_Flip(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWSURFACE a, DWORD b)
 {
-#if _DEBUGx
+#if _DEBUG_X
     printf("IDirectDrawSurface::Flip(This=%p, ...)\n", This);
 #endif
 
@@ -219,7 +219,7 @@ HRESULT __stdcall ddraw_surface_GetAttachedSurface(IDirectDrawSurfaceImpl *This,
 
 HRESULT __stdcall ddraw_surface_GetBltStatus(IDirectDrawSurfaceImpl *This, DWORD a)
 {
-#if _DEBUGx
+#if _DEBUG_X
     printf("IDirectDrawSurface::GetBltStatus(This=%p, ...)\n", This);
 #endif
     return DD_OK;
@@ -283,7 +283,7 @@ HRESULT __stdcall ddraw_surface_Initialize(IDirectDrawSurfaceImpl *This, LPDIREC
 
 HRESULT __stdcall ddraw_surface_IsLost(IDirectDrawSurfaceImpl *This)
 {
-#if _DEBUGx
+#if _DEBUG_X
     printf("IDirectDrawSurface::IsLost(This=%p)\n", This);
 #endif
     return DD_OK;
@@ -291,7 +291,7 @@ HRESULT __stdcall ddraw_surface_IsLost(IDirectDrawSurfaceImpl *This)
 
 HRESULT __stdcall ddraw_surface_Lock(IDirectDrawSurfaceImpl *This, LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent)
 {
-#if _DEBUGx
+#if _DEBUG_X
     printf("DirectDrawSurface::Lock(This=%p, lpDestRect=%p, lpDDSurfaceDesc=%p, dwFlags=%d, hEvent=%p)\n", This, lpDestRect, lpDDSurfaceDesc, (int)dwFlags, hEvent);
 
     if(dwFlags & DDLOCK_SURFACEMEMORYPTR)
@@ -367,7 +367,7 @@ HRESULT __stdcall ddraw_surface_SetPalette(IDirectDrawSurfaceImpl *This, LPDIREC
 
 HRESULT __stdcall ddraw_surface_Unlock(IDirectDrawSurfaceImpl *This, LPVOID lpRect)
 {
-#if _DEBUGx
+#if _DEBUG_X
     printf("DirectDrawSurface::Unlock(This=%p, lpRect=%p)\n", This, lpRect);
 #endif