From 812be09437f0ccf05a89544e3864c229e250b420 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Mon, 18 Sep 2000 15:33:19 +0000
Subject: [PATCH]

---
 source/mem/memory.cpp | 2 +-
 source/pad/pads.h     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/mem/memory.cpp b/source/mem/memory.cpp
index e7484c506..459af6b12 100644
--- a/source/mem/memory.cpp
+++ b/source/mem/memory.cpp
@@ -38,7 +38,7 @@ static const unsigned int	MEM_GUARD_SIZE=sizeof(int)*2;
 #include "gfx/prim.h"
 #endif
 
-#ifndef __PADS_H__
+#ifndef __PAD_PADS_H__
 #include "pad/pads.h"
 #endif
 
diff --git a/source/pad/pads.h b/source/pad/pads.h
index 0434b6618..5913e76e7 100644
--- a/source/pad/pads.h
+++ b/source/pad/pads.h
@@ -2,8 +2,8 @@
 /*** Pad Stuff ***/
 /*****************/
 
-#ifndef __PADS_H__
-#define __PADS_H__
+#ifndef __PAD_PADS_H__
+#define __PAD_PADS_H__
 
 /*****************************************************************************/
 #define DUALSHOCKMODE ((u_long *)0x80010000)