From 34170974844244be1034baacd3639481f776b563 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Fri, 26 Apr 2013 15:10:52 +0200
Subject: [PATCH] Fix Win32 build.

---
 Makefile.win   | 6 +++++-
 input/dinput.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.win b/Makefile.win
index 61f096c903..35a3e76472 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -42,7 +42,7 @@ JOBJ := conf/config_file.o \
 	tools/retroarch-joyconfig.o \
 	compat/compat.o \
 	file_path.o \
-	input/input_common.o \
+	tools/input_common_joyconfig.o \
 	input/dinput.o
 
 CC = gcc
@@ -254,6 +254,10 @@ $(TARGET): $(OBJ)
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 
+tools/input_common_joyconfig.o: input/input_common.c
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -DIS_JOYCONFIG -c -o $@ $<
+
 %.o: %.cpp
 	@$(if $(Q), $(shell echo echo CXX $<),)
 	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -c -o $@ $<
diff --git a/input/dinput.c b/input/dinput.c
index f30e12862b..8865395e23 100644
--- a/input/dinput.c
+++ b/input/dinput.c
@@ -557,7 +557,7 @@ static bool dinput_joypad_query_pad(unsigned pad)
 
 static const char *dinput_joypad_name(unsigned pad)
 {
-   (unsigned)pad;
+   (void)pad;
    // FIXME
    return NULL;
 }