X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfinput%2Fmain.c;h=974c4dddac819721a7eb5fb7213a032bfdca2c68;hb=e30d9e263db0fca574753a5be6674b65ee877b0a;hp=af6b80b8516e1099e1d9e00d085234f0028f6b53;hpb=4b353f8adc434d4168df88bca58e793becaa891b;p=pcsx_rearmed.git

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index af6b80b8..974c4ddd 100644
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -8,13 +8,6 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef _WIN32
-#define CALLBACK
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
 #include "main.h"
 
 unsigned char CurPad, CurByte, CurCmd, CmdLen;
@@ -27,6 +20,8 @@ extern unsigned char CALLBACK PAD2__startPoll(int pad);
 extern unsigned char CALLBACK PAD1__poll(unsigned char value);
 extern unsigned char CALLBACK PAD2__poll(unsigned char value);
 
+#ifndef HAVE_LIBRETRO
+
 static int old_controller_type1 = -1, old_controller_type2 = -1;
 
 #define select_pad(n) \
@@ -40,12 +35,12 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			pad_init(); \
 			break; \
 		case PSE_PAD_TYPE_GUNCON: \
-			//Removed for new Guncon functionality, may have been required for very old touchscreen support
-			//PAD##n##_startPoll = PADstartPoll_guncon; \
-			//PAD##n##_poll = PADpoll_guncon; \
-			//guncon_init(); \
-			//break; \
-                case PSE_PAD_TYPE_NEGCON: \
+			/* Removed for new Guncon functionality, may have been required for very old touchscreen support */ \
+			/* PAD##n##_startPoll = PADstartPoll_guncon; */ \
+			/* PAD##n##_poll = PADpoll_guncon; */ \
+			/* guncon_init(); */ \
+			/* break; */ \
+		case PSE_PAD_TYPE_NEGCON: \
 		case PSE_PAD_TYPE_GUN: \
 		default: \
 			PAD##n##_startPoll = PAD##n##__startPoll; \
@@ -53,6 +48,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			break; \
 		} \
 	}
+#endif /* HAVE_LIBRETRO */
 
 
 void dfinput_activate(void)