Change style to Salvador Garcia's patch since it makes more intuitive sense.
Add macro to Symbol.xs since it doesn't load mod_perl.h
git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/1.x@1157326 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Symbol/Symbol.xs b/Symbol/Symbol.xs
index c22b2b9..833b923 100644
--- a/Symbol/Symbol.xs
+++ b/Symbol/Symbol.xs
@@ -2,6 +2,10 @@
#include "perl.h"
#include "XSUB.h"
+#ifndef CvGV_set
+# define CvGV_set(cv, val) (CvGV(cv) = val)
+#endif
+
#ifdef PERL_OBJECT
#define sv_name(svp) svp
#define undef(ref)
diff --git a/src/modules/perl/mod_perl.h b/src/modules/perl/mod_perl.h
index 5c654ba..935dd05 100644
--- a/src/modules/perl/mod_perl.h
+++ b/src/modules/perl/mod_perl.h
@@ -1031,7 +1031,7 @@
#endif
#ifndef CvGV_set
-#define CvGV_set(gv, cv) (CvGV(gv) = (cv))
+#define CvGV_set(cv, gv) (CvGV(cv) = (gv))
#endif
typedef struct {
