remove #define EXTERN trick in cgraph

This was designed to allow one declaration of Ag_G_global serve as both
declaration and definition. However, this obscures the actual definition of this
variable from any code browser unable to evaluate macro expansion (e.g. Cscope).
There's no real need for this trick, as we can just define the variable as
normal.

diff --git a/lib/cgraph/cghdr.h b/lib/cgraph/cghdr.h
index db195d5db16aa74d8dd9394245c22aeb4215263d..131efbadfd2a72daf9673b9e71b604cdabb79922 100644 (file)
--- a/lib/cgraph/cghdr.h
+++ b/lib/cgraph/cghdr.h
@@ -15,10 +15,6 @@
 #define ATT_GRAPHPVT_H 1
 #define _BLD_cgraph 1
 
-#ifndef EXTERN
-#define EXTERN extern
-#endif
-
 #ifdef _WIN32
 #   ifdef EXPORT_CGHDR
 #       define CGHDR_API __declspec(dllexport)
@@ -75,7 +71,7 @@ CGHDR_API int agapply(Agraph_t * g, Agobj_t * obj, agobjfn_t fn, void *arg,
            int preorder);
 
        /* global variables */
-EXTERN Agraph_t *Ag_G_global;
+extern Agraph_t *Ag_G_global;
 extern char *AgDataRecName;
 
        /* set ordering disciplines */

diff --git a/lib/cgraph/graph.c b/lib/cgraph/graph.c
index 453ac52c2910c9673d586387ae9ea9ac9f0a9bd4..0d9dbac378c38691f79d7be05b3f3de1ed451a41 100644 (file)
--- a/lib/cgraph/graph.c
+++ b/lib/cgraph/graph.c
@@ -11,9 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#define EXTERN
 #include <cghdr.h>
 
+Agraph_t *Ag_G_global;
+
 const char AgraphVersion[] = PACKAGE_VERSION;
 
 /*