Merge b4225f436a into 90d0abdae0

desmume/src/frontend/windows/inputdx.cpp

@@ -51,13 +51,6 @@
 #include "main.h"
 #include "winutil.h"
 
-	//60 is a poor choice for a threshold; the theoretical maximum you can get even at an exact 45 degree angle is 70
-	//Sloshy sticks or slightly-off angles make it impossible to reach 60, as it's far too close to 70.
-	//Too-small values feel bad, too
-	//50 is a more normal choice
-	//#define S9X_JOY_NEUTRAL 60
-int S9X_JOY_NEUTRAL = 50;
-
 // Gamepad Dialog Strings
 // Support Unicode display
 //#define INPUTCONFIG_TITLE "Input Configuration"
@@ -529,9 +522,6 @@ BOOL di_init()
 {
 	HWND hParentWnd = MainWindow->getHWnd();
 
-	S9X_JOY_NEUTRAL = GetPrivateProfileInt("Controls", "DigitalizationThreshold", S9X_JOY_NEUTRAL, IniName);
-	
-
 	pDI = NULL;
 	memset(cDIBuf, 0, sizeof(cDIBuf));
 
@@ -681,6 +671,10 @@ int FunkyNormalize(int cur, int min, int max)
     return Result;
 }
 
+
+
+#define S9X_JOY_NEUTRAL 60
+
 void CheckAxis (short joy, short control, int val,
                                        int min, int max,
                                        bool &first, bool &second)

desmume/src/libretro-common/file/file_path.c

@@ -20,11 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef __MACH__
-#define _DARWIN_C_SOURCE    /* As below, plus strl* functions */
-#else
 #define _XOPEN_SOURCE 500   /* For strdup, realpath */
-#endif
 
 #include <stdlib.h>
 #include <boolean.h>