Revert jperkin's patch until we find a dos2unix solution.

Ok jperkin

3 files changed, 21 insertions, 22 deletions

diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index d6307a81397..68d20792907 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2014/09/24 12:33:44 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2014/09/24 20:20:49 wiz Exp $
 
 SHA1 (mame0154s.zip) = b5273ef2bfaf9bdf747af34eb3b1346b30f99047
 RMD160 (mame0154s.zip) = 9d26953fcae65f3f95c1999ce7c96fa440de2f64
 Size (mame0154s.zip) = 39697095 bytes
-SHA1 (patch-src_lib_web_mongoose.c) = d35e93b70b496cc149fb78e401a896fc13ef3014
-SHA1 (patch-src_osd_osdcore.h) = efcb18fa486ed394e42a3c41addee36f4c52a548
+SHA1 (patch-src_lib_web_mongoose.c) = 32b807a6a38d7b3314a820278eaadbbe1bb3ca4c
+SHA1 (patch-src_osd_osdcore.h) = 4dbc233a613d1743f97d3cb9c6526fb56ca7b6d6
diff --git a/emulators/mame/patches/patch-src_lib_web_mongoose.c b/emulators/mame/patches/patch-src_lib_web_mongoose.c
index 8a29297a118..96e55b9d6a4 100644
--- a/emulators/mame/patches/patch-src_lib_web_mongoose.c
+++ b/emulators/mame/patches/patch-src_lib_web_mongoose.c
@@ -1,17 +1,16 @@
-$NetBSD: patch-src_lib_web_mongoose.c,v 1.2 2014/09/24 12:33:44 jperkin Exp $
+$NetBSD: patch-src_lib_web_mongoose.c,v 1.3 2014/09/24 20:20:49 wiz Exp $
 
 If _XOPEN_SOURCE is defined to 600, NetBSD does not provide strtoll
 and other stuff.
 
 --- src/lib/web/mongoose.c.orig	2014-07-22 08:14:56.000000000 +0000
 +++ src/lib/web/mongoose.c
-@@ -46,7 +46,9 @@
- #define _INTEGRAL_MAX_BITS 64   // Enable _stati64() on Windows

- #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005+

- #undef WIN32_LEAN_AND_MEAN      // Let windows.h always include winsock2.h

-+#ifdef __linux__

- #define _XOPEN_SOURCE 600       // For flockfile() on Linux

-+#endif

- #define __STDC_FORMAT_MACROS    // <inttypes.h> wants this for C++

- #define __STDC_LIMIT_MACROS     // C++ wants that for INT64_MAX

- #define _LARGEFILE_SOURCE       // Enable fseeko() and ftello() functions

+@@ -46,7 +46,7 @@
+ #define _INTEGRAL_MAX_BITS 64   // Enable _stati64() on Windows
+ #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005+
+ #undef WIN32_LEAN_AND_MEAN      // Let windows.h always include winsock2.h
+-#define _XOPEN_SOURCE 600       // For flockfile() on Linux
++//#define _XOPEN_SOURCE 600       // For flockfile() on Linux
+ #define __STDC_FORMAT_MACROS    // <inttypes.h> wants this for C++
+ #define __STDC_LIMIT_MACROS     // C++ wants that for INT64_MAX
+ #define _LARGEFILE_SOURCE       // Enable fseeko() and ftello() functions
diff --git a/emulators/mame/patches/patch-src_osd_osdcore.h b/emulators/mame/patches/patch-src_osd_osdcore.h
index 0045dcbaabc..2bb5939b1d9 100644
--- a/emulators/mame/patches/patch-src_osd_osdcore.h
+++ b/emulators/mame/patches/patch-src_osd_osdcore.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_osd_osdcore.h,v 1.2 2014/09/24 12:33:44 jperkin Exp $
+$NetBSD: patch-src_osd_osdcore.h,v 1.3 2014/09/24 20:20:49 wiz Exp $
 
 Include stdarg.h for va_list.
 
 --- src/osd/osdcore.h.orig	2014-04-25 09:31:28.000000000 +0000
 +++ src/osd/osdcore.h
 @@ -19,6 +19,7 @@
- #ifndef __OSDCORE_H__

- #define __OSDCORE_H__

- 

-+#include <stdarg.h>

- #include "osdcomm.h"

- #include "delegate.h"

- 

+ #ifndef __OSDCORE_H__
+ #define __OSDCORE_H__
+ 
++#include <stdarg.h>
+ #include "osdcomm.h"
+ #include "delegate.h"
+