From 50b6e4acacf204590d90c1516c044e6b1cef498b Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 25 Nov 2012 13:18:36 +0000
Subject: [PATCH] Guard macros.h by #ifndef/#define, remove two decls of
 nonexistent functions.

In jmact/mathutil.h: FindDistance3D_HP() and ArcTangentAppx().

git-svn-id: https://svn.eduke32.com/eduke32@3224 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/jmact/mathutil.h   | 2 --
 polymer/eduke32/source/macros.h           | 4 ++++
 polymer/eduke32/source/sounds_mapster32.c | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/polymer/eduke32/source/jmact/mathutil.h b/polymer/eduke32/source/jmact/mathutil.h
index 48839c2a4..8d87ffd9e 100644
--- a/polymer/eduke32/source/jmact/mathutil.h
+++ b/polymer/eduke32/source/jmact/mathutil.h
@@ -32,8 +32,6 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
 
 extern int32_t FindDistance2D(int32_t dx, int32_t dy);
 extern int32_t FindDistance3D(int32_t dx, int32_t dy, int32_t dz);
-extern int32_t FindDistance3D_HP(int32_t dx, int32_t dy, int32_t dz);
-extern int32_t ArcTangentAppx(int32_t dx, int32_t dy);
 
 #ifdef EXTERNC
 }
diff --git a/polymer/eduke32/source/macros.h b/polymer/eduke32/source/macros.h
index 7b1bfd711..1054d1876 100644
--- a/polymer/eduke32/source/macros.h
+++ b/polymer/eduke32/source/macros.h
@@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //-------------------------------------------------------------------------
 
+#ifndef EDUKE32_MACROS_H_
+#define EDUKE32_MACROS_H_
+
 // Macros, some from SW source
 
 #define ALT_IS_PRESSED ( KB_KeyPressed( sc_RightAlt ) || KB_KeyPressed( sc_LeftAlt ) )
@@ -206,3 +209,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define T8  actor[i].t_data[7]
 #define T9  actor[i].t_data[8]
 
+#endif
diff --git a/polymer/eduke32/source/sounds_mapster32.c b/polymer/eduke32/source/sounds_mapster32.c
index 9d1bf8eaf..1bb23bfb4 100644
--- a/polymer/eduke32/source/sounds_mapster32.c
+++ b/polymer/eduke32/source/sounds_mapster32.c
@@ -32,11 +32,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "osd.h"
 
 #include "cache1d.h"
-#include "macros.h"
-#include "mathutil.h"
 #include "build.h"  // vec3_t
 #include "editor.h"
 
+#include "macros.h"
+#include "mathutil.h"
+
 #ifdef WIN32
 #include "winlayer.h"
 #endif