From d5da4694480008c083896a43dc21f7c4434096eb Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Thu, 28 Jun 2012 08:26:47 +0200
Subject: Remove ANGBAND30X conditional code

---
 src/main-crb.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/main-crb.c b/src/main-crb.c
index 3bcbecfc..ad027c72 100644
--- a/src/main-crb.c
+++ b/src/main-crb.c
@@ -232,9 +232,6 @@
  * DEFINES = -DMACH_O_CARBON -DANGBAND30X
  * LIBS = -framework CoreFoundation -framework QuickTime -framework Carbon
  *
- * -DANGBAND30X only affects main-crb.c. This is because I'm also compiling
- * a couple of variants, and this arrangement makes my life easier.
- *
  * Never, ever #define MACINTOSH.  It'll wreck havoc in system interface
  * (mostly because of totally different pathname convention).
  *
@@ -569,20 +566,12 @@ static bool_ check_create_user_dir(void)
  * that has some interesting features.
  */
 
-/* Some porting examples */
-#ifdef ANGBAND30X
-# define USE_DOUBLE_TILES
-# define ALLOW_BIG_SCREEN
-# define HAS_SCORE_MENU
-# define NEW_ZVIRT_HOOKS
-#endif /* ANGBAND30X */
-
-# define USE_DOUBLE_TILES
-# define SAVEFILE_SCREEN
-# define ANG281_RESET_VISUALS
-# define ALLOW_BIG_SCREEN
-# define HAS_SCORE_MENU
-# define ANGBAND_CREATOR 'PrnA'
+#define USE_DOUBLE_TILES
+#define SAVEFILE_SCREEN
+#define ANG281_RESET_VISUALS
+#define ALLOW_BIG_SCREEN
+#define HAS_SCORE_MENU
+#define ANGBAND_CREATOR 'PrnA'
 
 /* Default creator signature */
 #ifndef ANGBAND_CREATOR
@@ -5800,11 +5789,7 @@ static void *lifeboat = NULL;
 /*
  * Hook to "release" memory
  */
-#ifdef NEW_ZVIRT_HOOKS /* [V] removed the unused 'size' argument. */
-static void *hook_rnfree(void *v)
-#else
 static void *hook_rnfree(void *v, size_t size)
-#endif /* NEW_ZVIRT_HOOKS */
 {
 
 #ifdef USE_MALLOC
-- 
cgit v1.2.3