Commit 7ae096d2 authored by Emden R. Gansner's avatar Emden R. Gansner

Replace WIN32_DLL with WIN32, which is defined by default in Visual Studio.

parent 58841ba4
......@@ -153,7 +153,7 @@
/* for clusters */
#define CL_BACK 10 /* cost of backward pointing edge */
#define CL_OFFSET 8 /* margin of cluster box in PS points */
#ifndef MSWIN32
#ifndef WIN32
#define CL_CROSS 1000 /* cost of cluster skeleton edge crossing */
#else
#define CL_CROSS 100 /* avoid 16 bit overflow */
......
......@@ -43,7 +43,7 @@
#endif
#endif
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -45,7 +45,7 @@ extern "C" {
#ifdef GVDLL
#define extern __declspec(dllexport)
#else
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -30,7 +30,7 @@ extern "C" {
#endif
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -59,7 +59,7 @@ extern "C" {
typedef void (*nodesizefn_t) (Agnode_t *, boolean);
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -20,7 +20,7 @@ extern "C" {
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -18,7 +18,7 @@
#include <string.h>
#include <stdarg.h>
#include <math.h>
#ifdef _WIN32
#ifdef WIN32
#include <windows.h>
#include <winuser.h>
#include <tchar.h>
......
......@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <string.h>
#ifdef _WIN32
#ifdef WIN32
#include "glpangofont.h"
typedef float GLfloat;
#else
......
......@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <string.h>
#ifdef _WIN32
#ifdef WIN32
#include "glpangofont.h"
typedef float GLfloat;
#else
......
......@@ -18,7 +18,7 @@
#ifndef glCompFontURE_H
#define glCompFontURE_H
#ifdef _WIN32
#ifdef WIN32
#include "windows.h"
#endif
#include <stdio.h>
......
......@@ -14,7 +14,7 @@
#ifndef GLUTILS_H
#define GLUTILS_H
#ifdef _WIN32
#ifdef WIN32
#include "windows.h"
#endif
#include <GL/gl.h>
......
......@@ -28,7 +28,7 @@ extern "C" {
#endif
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -64,7 +64,7 @@ extern "C" {
typedef struct gvplugin_available_s gvplugin_available_t;
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
__declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
#else
......@@ -75,7 +75,7 @@ __declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
/*end visual studio*/
#ifndef WIN32_DLL
#ifndef WIN32
#if defined(GVDLL)
__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
#else
......
......@@ -27,7 +27,7 @@ extern "C" {
#endif
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -27,7 +27,7 @@ extern "C" {
#endif
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -82,7 +82,7 @@ extern "C" {
extern void initGPRState(Gpr_t *, Vmalloc_t *);
extern int validTVT(int);
#ifdef WIN32_DLL
#ifdef WIN32
extern int pathisrelative (char* path);
#endif
......
......@@ -58,7 +58,7 @@ typedef unsigned int packval_t;
} pack_info;
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef GVC_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -32,7 +32,7 @@ extern "C" {
#endif
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef PATHPLAN_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -46,7 +46,7 @@ extern "C" {
/* this is computed from the above */
array2 vis;
};
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef PATHPLAN_EXPORTS
#define extern __declspec(dllimport)
#endif
......
......@@ -110,7 +110,7 @@ extern "C" {
#endif
/*visual studio*/
#ifdef WIN32_DLL
#ifdef WIN32
#ifndef VMALLOC_EXPORTS
#define extern __declspec(dllimport)
#else
......
......@@ -13,7 +13,7 @@
#ifndef XDOT_H
#define XDOT_H
#include <stdio.h>
#ifdef _WIN32
#ifdef WIN32
#include <windows.h>
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment