From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Sun, 2 Jan 2022 10:02:42 +0000 (+0100)
Subject: common: [nfc] rename DECLSPEC macro to GLOBALS_API in globals.h
X-Git-Tag: 3.0.0~84^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37b73b3c2a29e0a71453a3f4e713b2205bd68c84;p=graphviz

common: [nfc] rename DECLSPEC macro to GLOBALS_API in globals.h
---

diff --git a/lib/common/globals.h b/lib/common/globals.h
index 1c11a2d7b..e52e77634 100644
--- a/lib/common/globals.h
+++ b/lib/common/globals.h
@@ -16,55 +16,55 @@ extern "C" {
 
 #if defined(GVDLL) || defined(WIN32_DLL)
 #if defined(GVC_EXPORTS) || defined(_BLD_gvc)
-#define DECLSPEC __declspec(dllexport)
+#define GLOBALS_API __declspec(dllexport)
 #else
-#define DECLSPEC __declspec(dllimport)
+#define GLOBALS_API __declspec(dllimport)
 #endif
 #endif
 
-#ifndef DECLSPEC
-#define DECLSPEC /* nothing */
+#ifndef GLOBALS_API
+#define GLOBALS_API /* nothing */
 #endif
 
 #ifndef EXTERN
 #define EXTERN extern
 #endif
 
-    DECLSPEC EXTERN char *Version;
-    DECLSPEC EXTERN char **Files;	/* from command line */
-    DECLSPEC EXTERN const char **Lib;		/* from command line */
-    DECLSPEC EXTERN char *CmdName;
-    DECLSPEC EXTERN char *Gvfilepath;  /* Per-process path of files allowed in image attributes (also ps libs) */
-    DECLSPEC EXTERN char *Gvimagepath; /* Per-graph path of files allowed in image attributes  (also ps libs) */
+    GLOBALS_API EXTERN char *Version;
+    GLOBALS_API EXTERN char **Files;	/* from command line */
+    GLOBALS_API EXTERN const char **Lib;		/* from command line */
+    GLOBALS_API EXTERN char *CmdName;
+    GLOBALS_API EXTERN char *Gvfilepath;  /* Per-process path of files allowed in image attributes (also ps libs) */
+    GLOBALS_API EXTERN char *Gvimagepath; /* Per-graph path of files allowed in image attributes  (also ps libs) */
 
-    DECLSPEC EXTERN unsigned char Verbose;
-    DECLSPEC EXTERN unsigned char Reduce;
-    DECLSPEC EXTERN int MemTest;
-    DECLSPEC EXTERN char *HTTPServerEnVar;
-    DECLSPEC EXTERN int graphviz_errors;
-    DECLSPEC EXTERN int Nop;
-    DECLSPEC EXTERN double PSinputscale;
-    DECLSPEC EXTERN int Show_cnt;
-    DECLSPEC EXTERN char** Show_boxes;	/* emit code for correct box coordinates */
-    DECLSPEC EXTERN int CL_type;		/* NONE, LOCAL, GLOBAL */
-    DECLSPEC EXTERN unsigned char Concentrate;	/* if parallel edges should be merged */
-    DECLSPEC EXTERN double Epsilon;	/* defined in input_graph */
-    DECLSPEC EXTERN int MaxIter;
-    DECLSPEC EXTERN int Ndim;
-    DECLSPEC EXTERN int State;		/* last finished phase */
-    DECLSPEC EXTERN int EdgeLabelsDone;	/* true if edge labels have been positioned */
-    DECLSPEC EXTERN double Initial_dist;
-    DECLSPEC EXTERN double Damping;
-    DECLSPEC EXTERN int Y_invert;	/* invert y in dot & plain output */
-    DECLSPEC EXTERN int GvExitOnUsage;   /* gvParseArgs() should exit on usage or error */
+    GLOBALS_API EXTERN unsigned char Verbose;
+    GLOBALS_API EXTERN unsigned char Reduce;
+    GLOBALS_API EXTERN int MemTest;
+    GLOBALS_API EXTERN char *HTTPServerEnVar;
+    GLOBALS_API EXTERN int graphviz_errors;
+    GLOBALS_API EXTERN int Nop;
+    GLOBALS_API EXTERN double PSinputscale;
+    GLOBALS_API EXTERN int Show_cnt;
+    GLOBALS_API EXTERN char** Show_boxes;	/* emit code for correct box coordinates */
+    GLOBALS_API EXTERN int CL_type;		/* NONE, LOCAL, GLOBAL */
+    GLOBALS_API EXTERN unsigned char Concentrate;	/* if parallel edges should be merged */
+    GLOBALS_API EXTERN double Epsilon;	/* defined in input_graph */
+    GLOBALS_API EXTERN int MaxIter;
+    GLOBALS_API EXTERN int Ndim;
+    GLOBALS_API EXTERN int State;		/* last finished phase */
+    GLOBALS_API EXTERN int EdgeLabelsDone;	/* true if edge labels have been positioned */
+    GLOBALS_API EXTERN double Initial_dist;
+    GLOBALS_API EXTERN double Damping;
+    GLOBALS_API EXTERN int Y_invert;	/* invert y in dot & plain output */
+    GLOBALS_API EXTERN int GvExitOnUsage;   /* gvParseArgs() should exit on usage or error */
 
-    DECLSPEC EXTERN Agsym_t
+    GLOBALS_API EXTERN Agsym_t
 	*G_activepencolor, *G_activefillcolor,
 	*G_visitedpencolor, *G_visitedfillcolor,
 	*G_deletedpencolor, *G_deletedfillcolor,
 	*G_ordering, *G_peripheries, *G_penwidth,
 	*G_gradientangle, *G_margin;
-    DECLSPEC EXTERN Agsym_t
+    GLOBALS_API EXTERN Agsym_t
 	*N_height, *N_width, *N_shape, *N_color, *N_fillcolor,
 	*N_activepencolor, *N_activefillcolor,
 	*N_selectedpencolor, *N_selectedfillcolor,
@@ -76,7 +76,7 @@ extern "C" {
 	*N_skew, *N_distortion, *N_fixed, *N_imagescale, *N_imagepos, *N_layer,
 	*N_group, *N_comment, *N_vertices, *N_z,
 	*N_penwidth, *N_gradientangle;
-    DECLSPEC EXTERN Agsym_t
+    GLOBALS_API EXTERN Agsym_t
 	*E_weight, *E_minlen, *E_color, *E_fillcolor,
 	*E_activepencolor, *E_activefillcolor,
 	*E_selectedpencolor, *E_selectedfillcolor,
@@ -94,10 +94,10 @@ extern "C" {
 	*E_tailclip, *E_headclip,
 	*E_penwidth;
 
-    DECLSPEC extern struct fdpParms_s* fdp_parms;
+    GLOBALS_API extern struct fdpParms_s* fdp_parms;
 
 #undef EXTERN
-#undef DECLSPEC
+#undef GLOBALS_API
 
 #ifdef __cplusplus
 }