view src/pstoedit-3-nosecapi.patch @ 4037:85abb6c3ec8b

of-netcdf: patch for --enable-64 (Bug #46060) * src/of-netcdf-1-fixes.patch: new file * dist-files.mk: add of-netcdf-1-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 29 Sep 2015 19:43:19 -0400
parents a6b0b01511ba
children 4ebe3efd8e98
line wrap: on
line source

diff -ur pstoedit-3.62.orig/src/cppcomp.h pstoedit-3.62/src/cppcomp.h
--- pstoedit-3.62.orig/src/cppcomp.h	2014-07-25 09:09:48 -0400
+++ pstoedit-3.62/src/cppcomp.h	2014-07-25 09:12:17 -0400
@@ -33,7 +33,12 @@
 # define DLLEXPORT
 #endif
 
-
+#ifdef __MINGW32__
+  #include <_mingw.h>
+  #ifdef MINGW_HAS_SECURE_API
+    #undef MINGW_HAS_SECURE_API
+  #endif
+#endif
 
 
 #ifdef _AIX
diff -ur pstoedit-3.62.orig/src/lexyy.cpp pstoedit-3.62/src/lexyy.cpp
--- pstoedit-3.62.orig/src/lexyy.cpp	2014-07-25 09:19:14 -0400
+++ pstoedit-3.62/src/lexyy.cpp	2014-07-25 09:20:00 -0400
@@ -14,6 +14,7 @@
 #endif
 
 /* First, we deal with  platform-specific or compiler-specific issues. */
+#include "cppcomp.h"
 
 /* begin standard C headers. */
 #include <stdio.h>
diff -ur pstoedit-3.70.orig/src/fillpoly.cpp pstoedit-3.70/src/fillpoly.cpp
--- pstoedit-3.70.orig/src/fillpoly.cpp	2015-06-13 07:21:31.042850400 -0400
+++ pstoedit-3.70/src/fillpoly.cpp	2015-06-13 07:28:44.826540800 -0400
@@ -1,6 +1,6 @@
 /* this file is taken from the hp2xx project (http://www.gnu.org/software/hp2xx/hp2xx.html) 
    and slightly adapted to fit into pstoedit s framework */ 
-
+#include "cppcomp.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -ur pstoedit-3.70.orig/src/drvwmf.cpp pstoedit-3.70/src/drvwmf.cpp
--- pstoedit-3.70.orig/src/drvwmf.cpp	2015-06-13 08:02:48.035020200 -0400
+++ pstoedit-3.70/src/drvwmf.cpp	2015-06-13 08:03:33.555528400 -0400
@@ -22,6 +22,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include "cppcomp.h"
+
 #include "drvwmf.h"
 
 #include I_string_h