From a4798fbd5dacddf374fcbe3e681b3e73685fc28b Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Thu, 2 May 2013 22:47:16 -0400
Subject: [PATCH] Some Mac OS X fixes.

Joystick was more stubborn than it should have been.
---
 src/archutils/Darwin/JoystickDevice.cpp | 2 +-
 src/archutils/Darwin/arch_setup.h       | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/archutils/Darwin/JoystickDevice.cpp b/src/archutils/Darwin/JoystickDevice.cpp
index 72a0c7b982..166b43acd6 100644
--- a/src/archutils/Darwin/JoystickDevice.cpp
+++ b/src/archutils/Darwin/JoystickDevice.cpp
@@ -262,7 +262,7 @@ int JoystickDevice::AssignIDs( InputDevice startID )
 
 void JoystickDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const
 {
-	for (Joystick &i : m_vSticks)
+	for (auto &i : m_vSticks)
 		vDevices.push_back( InputDeviceInfo(i.id,GetDescription()) );
 }
 
diff --git a/src/archutils/Darwin/arch_setup.h b/src/archutils/Darwin/arch_setup.h
index 5df4ca9414..10860230a8 100644
--- a/src/archutils/Darwin/arch_setup.h
+++ b/src/archutils/Darwin/arch_setup.h
@@ -43,16 +43,7 @@ extern "C" int SM_main( int argc, char *argv[] );
 #define ArchSwap16(n) OSSwapInt16((n))
 #define HAVE_BYTE_SWAPS
 
-// Define the work around if needed.
 #include <unistd.h>
-#include <stdint.h>
-#if _GLIBCXX_USE_C99
-# define NEED_CSTDLIB_WORKAROUND
-#else
-inline int64_t llabs( int64_t x ) { return x < 0LL ? -x : x; }
-#endif
-
-#define attribute_deprecated // Shut ffmpeg up!
 
 #endif