Re: cvs commit: parrot/dynclasses pyproxyclass.pmc pyproxytype.pmc

[William Coleda]

Not quite:

ld: multiple definitions of symbol _PROXY_STRING
pyproxytype.o definition of _PROXY_STRING in section (__DATA,__common)
pyproxyclass.o definition of _PROXY_STRING in section (__DATA,__common)

Sam Ruby wrote:

cvsuser     04/12/13 19:12:07

Modified: dynclasses pyproxyclass.pmc pyproxytype.pmc
Log:
PROXY must conflict with a prefixed C constant on MAC/OSX....
Revision Changes Path
1.2 +4 -4 parrot/dynclasses/pyproxyclass.pmc
Index: pyproxyclass.pmc
===================================================================
RCS file: /cvs/public/parrot/dynclasses/pyproxyclass.pmc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyproxyclass.pmc 13 Dec 2004 21:50:58 -0000 1.1
+++ pyproxyclass.pmc 14 Dec 2004 03:12:06 -0000 1.2
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: pyproxyclass.pmc,v 1.1 2004/12/13 21:50:58 rubys Exp $
+$Id: pyproxyclass.pmc,v 1.2 2004/12/14 03:12:06 rubys Exp $
=head1 NAME
@@ -24,7 +24,7 @@
#include "parrot/parrot.h"
static INTVAL dynclass_PyProxyClass;
-STRING *PROXY;
+STRING *PROXY_STRING;
pmclass PyProxyClass extends PyObject dynpmc group python_group {
@@ -43,7 +43,7 @@
if (pass) {
dynclass_PyProxyClass = Parrot_PMC_typenum(INTERP, "PyProxyClass");
- PROXY = const_string(INTERP, "__proxy__");
+ PROXY_STRING = const_string(INTERP, "__proxy__");
}
}
@@ -101,7 +101,7 @@
internal_exception(1, "Invoke() called on a PyProxyClass object");
INTERP->ctx.current_object = REG_PMC(2) = - VTABLE_getprop(INTERP, proxy, PROXY);
+ VTABLE_getprop(INTERP, proxy, PROXY_STRING);
return VTABLE_invoke(INTERP, (PMC*)PMC_struct_val(SELF), next);
}
1.2 +4 -4 parrot/dynclasses/pyproxytype.pmc
Index: pyproxytype.pmc
===================================================================
RCS file: /cvs/public/parrot/dynclasses/pyproxytype.pmc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyproxytype.pmc 13 Dec 2004 21:50:58 -0000 1.1
+++ pyproxytype.pmc 14 Dec 2004 03:12:06 -0000 1.2
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: pyproxytype.pmc,v 1.1 2004/12/13 21:50:58 rubys Exp $
+$Id: pyproxytype.pmc,v 1.2 2004/12/14 03:12:06 rubys Exp $
=head1 NAME
@@ -67,7 +67,7 @@
STRING *BASES;
STRING *CLASS;
STRING *INIT;
-STRING *PROXY;
+STRING *PROXY_STRING;
pmclass PyProxyType extends PyType dynpmc group python_group {
@@ -88,7 +88,7 @@
BASES = const_string(INTERP, "__bases__");
CLASS = const_string(INTERP, "__class__");
INIT = const_string(INTERP, "__init__");
- PROXY = const_string(INTERP, "__proxy__");
+ PROXY_STRING = const_string(INTERP, "__proxy__");
}
}
@@ -128,7 +128,7 @@
object = REG_PMC(5);
}
- VTABLE_setprop(INTERP, proxy, PROXY, object);
+ VTABLE_setprop(INTERP, proxy, PROXY_STRING, object);
REG_PMC(5) = proxy;
return next;