Files
MINGW-packages/mingw-w64-graphviz/001-msvc-pragma.patch.patch
2018-01-23 12:17:52 +03:00

409 lines
16 KiB
Diff

diff -Naur graphviz-2.40.1-orig/cmd/dot/dot.c graphviz-2.40.1/cmd/dot/dot.c
--- graphviz-2.40.1-orig/cmd/dot/dot.c 2016-12-14 08:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/dot/dot.c 2018-01-23 08:41:57.995502800 +0300
@@ -20,7 +20,7 @@
#include "gvc.h"
#include "gvio.h"
-#ifdef WIN32_DLL
+#ifdef _MSC_VER
__declspec(dllimport) boolean MemTest;
__declspec(dllimport) int GvExitOnUsage;
/*gvc.lib cgraph.lib*/
diff -Naur graphviz-2.40.1-orig/cmd/edgepaint/edgepaintmain.c graphviz-2.40.1/cmd/edgepaint/edgepaintmain.c
--- graphviz-2.40.1-orig/cmd/edgepaint/edgepaintmain.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/edgepaint/edgepaintmain.c 2018-01-23 08:41:33.205222100 +0300
@@ -10,7 +10,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvedit/main.cpp graphviz-2.40.1/cmd/gvedit/main.cpp
--- graphviz-2.40.1-orig/cmd/gvedit/main.cpp 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/gvedit/main.cpp 2018-01-23 08:42:58.924321100 +0300
@@ -27,7 +27,7 @@
#include "globals.h"
-#ifdef WIN32
+#ifdef _MSC_VER
/*gvc.lib cgraph.lib*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvmap/cluster.c graphviz-2.40.1/cmd/gvmap/cluster.c
--- graphviz-2.40.1-orig/cmd/gvmap/cluster.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/cluster.c 2018-01-23 08:41:33.205222100 +0300
@@ -31,7 +31,7 @@
#include "DotIO.h"
#include "colorutil.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvmap/gvmap.c graphviz-2.40.1/cmd/gvmap/gvmap.c
--- graphviz-2.40.1-orig/cmd/gvmap/gvmap.c 2016-10-29 07:44:55.000000000 +0300
+++ graphviz-2.40.1/cmd/gvmap/gvmap.c 2018-01-23 08:41:33.205222100 +0300
@@ -40,7 +40,7 @@
enum {MAX_GRPS = 10000};
static char swork[maxlen];
-#ifdef WIN32
+#ifdef _MSC_VER
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/gvpr/gvprmain.c graphviz-2.40.1/cmd/gvpr/gvprmain.c
--- graphviz-2.40.1-orig/cmd/gvpr/gvprmain.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/gvpr/gvprmain.c 2018-01-23 08:43:44.726867300 +0300
@@ -32,7 +32,7 @@
#include "gvpr.h"
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "gvprlib.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/mingle/minglemain.c graphviz-2.40.1/cmd/mingle/minglemain.c
--- graphviz-2.40.1-orig/cmd/mingle/minglemain.c 2016-12-10 08:44:58.000000000 +0300
+++ graphviz-2.40.1/cmd/mingle/minglemain.c 2018-01-23 08:44:41.693077100 +0300
@@ -10,7 +10,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/acyclic.c graphviz-2.40.1/cmd/tools/acyclic.c
--- graphviz-2.40.1-orig/cmd/tools/acyclic.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/acyclic.c 2018-01-23 08:44:57.994329700 +0300
@@ -20,7 +20,7 @@
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/bcomps.c graphviz-2.40.1/cmd/tools/bcomps.c
--- graphviz-2.40.1-orig/cmd/tools/bcomps.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/bcomps.c 2018-01-23 08:45:10.906971100 +0300
@@ -28,7 +28,7 @@
#include "cgraph.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/dijkstra.c graphviz-2.40.1/cmd/tools/dijkstra.c
--- graphviz-2.40.1-orig/cmd/tools/dijkstra.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/dijkstra.c 2018-01-23 08:45:22.401803300 +0300
@@ -11,7 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gc.c graphviz-2.40.1/cmd/tools/gc.c
--- graphviz-2.40.1-orig/cmd/tools/gc.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gc.c 2018-01-23 08:45:32.606449900 +0300
@@ -18,7 +18,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/gml2gv.c graphviz-2.40.1/cmd/tools/gml2gv.c
--- graphviz-2.40.1-orig/cmd/tools/gml2gv.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gml2gv.c 2018-01-23 08:45:44.996889200 +0300
@@ -29,7 +29,7 @@
static FILE *outFile;
static char *CmdName;
static char **Files;
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/graphml2gv.c graphviz-2.40.1/cmd/tools/graphml2gv.c
--- graphviz-2.40.1-orig/cmd/tools/graphml2gv.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/graphml2gv.c 2018-01-23 08:46:03.906553700 +0300
@@ -19,7 +19,7 @@
#include <expat.h>
#include <ctype.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gv2gml.c graphviz-2.40.1/cmd/tools/gv2gml.c
--- graphviz-2.40.1-orig/cmd/tools/gv2gml.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gv2gml.c 2018-01-23 08:46:23.400423900 +0300
@@ -14,7 +14,7 @@
* AT&T Research, Florham Park NJ *
**********************************************************/
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gvcolor.c graphviz-2.40.1/cmd/tools/gvcolor.c
--- graphviz-2.40.1-orig/cmd/tools/gvcolor.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gvcolor.c 2018-01-23 08:46:32.155668900 +0300
@@ -19,7 +19,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gvgen.c graphviz-2.40.1/cmd/tools/gvgen.c
--- graphviz-2.40.1-orig/cmd/tools/gvgen.c 2016-11-23 08:43:56.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gvgen.c 2018-01-23 08:46:39.835688700 +0300
@@ -15,7 +15,7 @@
* Written by Emden Gansner
*/
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/gvpack.c graphviz-2.40.1/cmd/tools/gvpack.c
--- graphviz-2.40.1-orig/cmd/tools/gvpack.c 2016-10-08 20:56:00.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gvpack.c 2018-01-23 08:46:49.898521100 +0300
@@ -30,7 +30,7 @@
#include "pack.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/gxl2gv.c graphviz-2.40.1/cmd/tools/gxl2gv.c
--- graphviz-2.40.1-orig/cmd/tools/gxl2gv.c 2016-08-10 00:02:10.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/gxl2gv.c 2018-01-23 08:47:09.316572300 +0300
@@ -18,7 +18,7 @@
#include <expat.h>
#include <ctype.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ingraphs.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/mm2gv.c graphviz-2.40.1/cmd/tools/mm2gv.c
--- graphviz-2.40.1-orig/cmd/tools/mm2gv.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/mm2gv.c 2018-01-23 08:47:19.493825100 +0300
@@ -33,7 +33,7 @@
#define real double
#define BUFS 1024
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/cmd/tools/nop.c graphviz-2.40.1/cmd/tools/nop.c
--- graphviz-2.40.1-orig/cmd/tools/nop.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/nop.c 2018-01-23 08:47:30.206461800 +0300
@@ -31,7 +31,7 @@
-? - print usage\n\
If no files are specified, stdin is used\n";
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/sccmap.c graphviz-2.40.1/cmd/tools/sccmap.c
--- graphviz-2.40.1-orig/cmd/tools/sccmap.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/sccmap.c 2018-01-23 08:47:39.571491500 +0300
@@ -36,7 +36,7 @@
#define INF ((unsigned int)(-1))
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/tred.c graphviz-2.40.1/cmd/tools/tred.c
--- graphviz-2.40.1-orig/cmd/tools/tred.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/tred.c 2018-01-23 08:47:50.678327400 +0300
@@ -45,7 +45,7 @@
char *CmdName;
#define MARK(n) (((Agnodeinfo_t*)(n->base.data))->mark)
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/cmd/tools/unflatten.c graphviz-2.40.1/cmd/tools/unflatten.c
--- graphviz-2.40.1-orig/cmd/tools/unflatten.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/cmd/tools/unflatten.c 2018-01-23 08:48:01.477762200 +0300
@@ -37,7 +37,7 @@
static FILE *outFile;
static char *cmd;
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/contrib/diffimg/diffimg.c graphviz-2.40.1/contrib/diffimg/diffimg.c
--- graphviz-2.40.1-orig/contrib/diffimg/diffimg.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/contrib/diffimg/diffimg.c 2018-01-23 08:48:20.537030200 +0300
@@ -25,7 +25,7 @@
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "libgd.lib" )
#pragma comment( lib, "png.lib" )
#pragma comment( lib, "gvc.lib" )
diff -Naur graphviz-2.40.1-orig/contrib/prune/prune.c graphviz-2.40.1/contrib/prune/prune.c
--- graphviz-2.40.1-orig/contrib/prune/prune.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/contrib/prune/prune.c 2018-01-23 08:48:34.269080300 +0300
@@ -28,7 +28,7 @@
#include "generic_list.h"
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "ingraphs.lib" )
#endif
diff -Naur graphviz-2.40.1-orig/lib/gvc/gvc.c graphviz-2.40.1/lib/gvc/gvc.c
--- graphviz-2.40.1-orig/lib/gvc/gvc.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/lib/gvc/gvc.c 2018-01-23 08:49:03.156781600 +0300
@@ -22,7 +22,7 @@
#include "gvio.h"
#include <stdlib.h>
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "cdt.lib" )
#pragma comment( lib, "ltdl.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/core/gvrender_core_dot.c graphviz-2.40.1/plugin/core/gvrender_core_dot.c
--- graphviz-2.40.1-orig/plugin/core/gvrender_core_dot.c 2016-12-05 08:43:27.000000000 +0300
+++ graphviz-2.40.1/plugin/core/gvrender_core_dot.c 2018-01-23 08:41:33.220822200 +0300
@@ -46,7 +46,7 @@
FORMAT_XDOT14,
} format_type;
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "xdot.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/dot_layout/gvlayout_dot_layout.c graphviz-2.40.1/plugin/dot_layout/gvlayout_dot_layout.c
--- graphviz-2.40.1-orig/plugin/dot_layout/gvlayout_dot_layout.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/dot_layout/gvlayout_dot_layout.c 2018-01-23 08:41:33.220822200 +0300
@@ -18,7 +18,7 @@
typedef enum { LAYOUT_DOT, } layout_type;
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "ingraphs.lib" )
#pragma comment( lib, "cdt.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/gd/gvdevice_gd.c graphviz-2.40.1/plugin/gd/gvdevice_gd.c
--- graphviz-2.40.1-orig/plugin/gd/gvdevice_gd.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/gd/gvdevice_gd.c 2018-01-23 08:41:33.220822200 +0300
@@ -14,7 +14,7 @@
#include "config.h"
-#ifdef WIN32 /*dependencies*/
+#ifdef _MSC_VER /*dependencies*/
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "libpng12.lib" )
#pragma comment( lib, "libgd.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/gdk/gvloadimage_gdk.c graphviz-2.40.1/plugin/gdk/gvloadimage_gdk.c
--- graphviz-2.40.1-orig/plugin/gdk/gvloadimage_gdk.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/gdk/gvloadimage_gdk.c 2018-01-23 08:41:33.252022200 +0300
@@ -23,7 +23,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdkcairo.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "cairo.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/neato_layout/gvlayout_neato_layout.c graphviz-2.40.1/plugin/neato_layout/gvlayout_neato_layout.c
--- graphviz-2.40.1-orig/plugin/neato_layout/gvlayout_neato_layout.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/neato_layout/gvlayout_neato_layout.c 2018-01-23 08:41:33.252022200 +0300
@@ -27,7 +27,7 @@
#include "globals.h"
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "cgraph.lib" )
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "pathplan.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/pango/gvloadimage_pango.c graphviz-2.40.1/plugin/pango/gvloadimage_pango.c
--- graphviz-2.40.1-orig/plugin/pango/gvloadimage_pango.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/pango/gvloadimage_pango.c 2018-01-23 08:41:33.252022200 +0300
@@ -21,7 +21,7 @@
#ifdef HAVE_PANGOCAIRO
#include <cairo.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "pango-1.0.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c graphviz-2.40.1/plugin/visio/gvplugin_visio.c
--- graphviz-2.40.1-orig/plugin/visio/gvplugin_visio.c 2018-01-23 08:35:15.453312500 +0300
+++ graphviz-2.40.1/plugin/visio/gvplugin_visio.c 2018-01-23 08:41:33.252022200 +0300
@@ -11,7 +11,7 @@
* Contributors: See CVS logs. Details at http://www.graphviz.org/
*************************************************************************/
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
// #pragma comment( lib, "glib-2.0.lib" )
// #pragma comment( lib, "pango-1.0.lib" )
diff -Naur graphviz-2.40.1-orig/plugin/webp/gvloadimage_webp.c graphviz-2.40.1/plugin/webp/gvloadimage_webp.c
--- graphviz-2.40.1-orig/plugin/webp/gvloadimage_webp.c 2016-09-20 07:45:02.000000000 +0300
+++ graphviz-2.40.1/plugin/webp/gvloadimage_webp.c 2018-01-23 08:50:17.208994500 +0300
@@ -24,7 +24,7 @@
#include <cairo.h>
#include <webp/decode.h>
-#ifdef WIN32 //*dependencies
+#ifdef _MSC_VER //*dependencies
#pragma comment( lib, "gvc.lib" )
#pragma comment( lib, "glib-2.0.lib" )
#pragma comment( lib, "pango-1.0.lib" )