From 690d94eb0376252818b5c27e86e0c70a6d01435d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 1 Sep 2011 00:32:20 +0200
Subject: CGE: Take fingolfin's remark into account: suppress the two leading
 underscore in define names

---
 engines/cge/bitmap.h   |  4 ++--
 engines/cge/cge_main.h |  4 ++--
 engines/cge/events.h   |  4 ++--
 engines/cge/fileio.h   |  4 ++--
 engines/cge/game.h     |  4 ++--
 engines/cge/general.h  |  4 ++--
 engines/cge/snail.h    |  4 ++--
 engines/cge/snddrv.h   | 13 ++-----------
 engines/cge/sound.h    |  4 ++--
 engines/cge/talk.h     |  4 ++--
 engines/cge/text.h     |  4 ++--
 engines/cge/vga13h.h   |  4 ++--
 engines/cge/vmenu.h    |  4 ++--
 engines/cge/walk.h     |  4 ++--
 14 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/engines/cge/bitmap.h b/engines/cge/bitmap.h
index 8896d13bb4..cd4f8267d1 100644
--- a/engines/cge/bitmap.h
+++ b/engines/cge/bitmap.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_BITMAP__
-#define __CGE_BITMAP__
+#ifndef CGE_BITMAP_H
+#define CGE_BITMAP_H
 
 #include "cge/fileio.h"
 //#include "cge/general.h"
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index cce3122235..5e2e3bbe46 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_CGE__
-#define __CGE_CGE__
+#ifndef CGE_CGEMAIN_H
+#define CGE_CGEMAIN_H
 
 #include "cge/vga13h.h"
 #include "cge/events.h"
diff --git a/engines/cge/events.h b/engines/cge/events.h
index 9b7de9efd4..62841dabe4 100644
--- a/engines/cge/events.h
+++ b/engines/cge/events.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_CGE_EVENTS__
-#define __CGE_CGE_EVENTS__
+#ifndef CGE_EVENTS_H
+#define CGE_EVENTS_H
 
 #include "common/events.h"
 #include "cge/game.h"
diff --git a/engines/cge/fileio.h b/engines/cge/fileio.h
index 7cb5ce07e0..4ac8e13292 100644
--- a/engines/cge/fileio.h
+++ b/engines/cge/fileio.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_FILEIO__
-#define __CGE_FILEIO__
+#ifndef CGE_FILEIO_H
+#define CGE_FILEIO_H
 
 #include "cge/general.h"
 #include "common/stream.h"
diff --git a/engines/cge/game.h b/engines/cge/game.h
index bb4f3655a2..63d686239e 100644
--- a/engines/cge/game.h
+++ b/engines/cge/game.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_GAME__
-#define __CGE_GAME__
+#ifndef CGE_GAME_H
+#define CGE_GAME_H
 
 #include "cge/vga13h.h"
 
diff --git a/engines/cge/general.h b/engines/cge/general.h
index 6a0bc13675..ad5abba6b1 100644
--- a/engines/cge/general.h
+++ b/engines/cge/general.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_GENERAL__
-#define __CGE_GENERAL__
+#ifndef CGE_GENERAL_H
+#define CGE_GENERAL_H
 
 #include "common/system.h"
 #include "common/file.h"
diff --git a/engines/cge/snail.h b/engines/cge/snail.h
index c2290da911..c6157a0096 100644
--- a/engines/cge/snail.h
+++ b/engines/cge/snail.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_SNAIL__
-#define __CGE_SNAIL__
+#ifndef CGE_SNAIL_H
+#define CGE_SNAIL_H
 
 #include "cge/cge.h"
 
diff --git a/engines/cge/snddrv.h b/engines/cge/snddrv.h
index 9e937d1cbf..987582190c 100644
--- a/engines/cge/snddrv.h
+++ b/engines/cge/snddrv.h
@@ -25,17 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-// ******************************************************
-// *  Sound Driver by Hedges (c) 1995 LK AVALON         *
-// *  Ver 1.00: 01-Mar-95                               *
-// *  Ver 1.10: 03-Mar-95                               *
-// *  Ver 1.20: 07-Mar-95                               *
-// *  Ver 1.30: 09-Mar-95                               *
-// *  Ver 1.40: 11-Mar-95                               *
-// ******************************************************
-
-#ifndef __CGE_SNDDRV__
-#define __CGE_SNDDRV__
+#ifndef CGE_SNDDRV_H
+#define CGE_SNDDRV_H
 
 namespace CGE {
 
diff --git a/engines/cge/sound.h b/engines/cge/sound.h
index 53f57a19b0..1474b78c28 100644
--- a/engines/cge/sound.h
+++ b/engines/cge/sound.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_SOUND__
-#define __CGE_SOUND__
+#ifndef CGE_SOUND_H
+#define CGE_SOUND_H
 
 #include "cge/fileio.h"
 #include "cge/snddrv.h"
diff --git a/engines/cge/talk.h b/engines/cge/talk.h
index 3591fc6fcc..6b06e8009c 100644
--- a/engines/cge/talk.h
+++ b/engines/cge/talk.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_TALK__
-#define __CGE_TALK__
+#ifndef CGE_TALK_H
+#define CGE_TALK_H
 
 #include "cge/general.h"
 #include "cge/vga13h.h"
diff --git a/engines/cge/text.h b/engines/cge/text.h
index d4607f8f3c..7ea0a947db 100644
--- a/engines/cge/text.h
+++ b/engines/cge/text.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_TEXT__
-#define __CGE_TEXT__
+#ifndef CGE_TEXT_H
+#define CGE_TEXT_H
 
 #include "cge/talk.h"
 
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index e917e86a32..3312065492 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_VGA13H__
-#define __CGE_VGA13H__
+#ifndef CGE_VGA13H_H
+#define CGE_VGA13H_H
 
 #include "common/serializer.h"
 #include "graphics/surface.h"
diff --git a/engines/cge/vmenu.h b/engines/cge/vmenu.h
index 0ddcfdb91d..30fcb53f4b 100644
--- a/engines/cge/vmenu.h
+++ b/engines/cge/vmenu.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_VMENU__
-#define __CGE_VMENU__
+#ifndef CGE_VMENU_H
+#define CGE_VMENU_H
 
 #include "cge/talk.h"
 
diff --git a/engines/cge/walk.h b/engines/cge/walk.h
index e924976927..a0dce1f715 100644
--- a/engines/cge/walk.h
+++ b/engines/cge/walk.h
@@ -25,8 +25,8 @@
  * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
  */
 
-#ifndef __CGE_WALK__
-#define __CGE_WALK__
+#ifndef CGE_WALK_H
+#define CGE_WALK_H
 
 #include "cge/vga13h.h"
 #include "cge/events.h"
-- 
cgit v1.2.3