From 0749c265c238d5a0578bf04ebab1092ecf016135 Mon Sep 17 00:00:00 2001
From: karri <karri@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Fri, 2 Nov 2012 19:39:38 +0000
Subject: [PATCH] Fix conflict in names

git-svn-id: svn://svn.cc65.org/cc65/trunk@5897 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 include/_suzy.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/_suzy.h b/include/_suzy.h
index 33e4901da..36789b81c 100644
--- a/include/_suzy.h
+++ b/include/_suzy.h
@@ -29,10 +29,10 @@
 #define __SUZY_H
 
 /* Joypad $FCB0 */
-#define JOY_RIGHT       0x10
-#define JOY_LEFT        0x20
-#define JOY_DOWN        0x40
-#define JOY_UP          0x80
+#define JOYPAD_RIGHT    0x10
+#define JOYPAD_LEFT     0x20
+#define JOYPAD_DOWN     0x40
+#define JOYPAD_UP       0x80
 #define BUTTON_OPTION1  0x08
 #define BUTTON_OPTION2  0x04
 #define BUTTON_INNER    0x02
-- 
2.39.5