richter 02/03/19 22:28:22
Modified: . Tag: Embperl2c Changes.pod epmacro.h epnames.h
Log:
make symbols unique
Revision Changes Path
No revision
No revision
1.129.4.55 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.54
retrieving revision 1.129.4.55
diff -u -r1.129.4.54 -r1.129.4.55
--- Changes.pod 18 Mar 2002 20:23:44 -0000 1.129.4.54
+++ Changes.pod 20 Mar 2002 06:28:22 -0000 1.129.4.55
@@ -7,6 +7,8 @@
is not required for make test. Reported by Jochen Topf.
- Removed EmbperlObject.pm from MANIFEST, since it was replaced by
Embperl/Object.pm.
+ - Make symbolsnames unique so they don't clash with 1.3.4. Reported
+ by Kee Hinckley.
=head1 2.0b6 (BETA) 13. Mar. 2002
1.6.4.9 +17 -17 embperl/epmacro.h
Index: epmacro.h
===================================================================
RCS file: /home/cvs/embperl/epmacro.h,v
retrieving revision 1.6.4.8
retrieving revision 1.6.4.9
diff -u -r1.6.4.8 -r1.6.4.9
--- epmacro.h 23 Jan 2002 07:58:26 -0000 1.6.4.8
+++ epmacro.h 20 Mar 2002 06:28:22 -0000 1.6.4.9
@@ -14,16 +14,16 @@
#define ADDINTMG(name) \
if (rc == 0) \
- rc = AddMagic (pApp, EMBPERL_##name##_NAME, &EMBPERL_mvtTab##name) ;
+ rc = AddMagic (pApp, EMBPERL_##name##_NAME, &EMBPERL2_mvtTab##name) ;
#define ADDOPTMG(name) \
if (rc == 0) \
- rc = AddMagic (pApp, "Embperl::"#name, &EMBPERL_mvtTab##name) ;
+ rc = AddMagic (pApp, "Embperl::"#name, &EMBPERL2_mvtTab##name) ;
#define INTMG(name,var,used,sub) \
\
-int EMBPERL_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
+int EMBPERL2_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
tReq * r = CurrReq ; \
@@ -37,7 +37,7 @@
return 0 ; \
} \
\
- int EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
+ int EMBPERL2_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
tReq * r = CurrReq ; \
@@ -50,50 +50,50 @@
return 0 ; \
} \
\
- MGVTBL EMBPERL_mvtTab##name = { EMBPERL_mgGet##name, EMBPERL_mgSet##name, NULL,
NULL, NULL } ;
+ MGVTBL EMBPERL2_mvtTab##name = { EMBPERL2_mgGet##name, EMBPERL2_mgSet##name,
NULL, NULL, NULL } ;
#define INTMGshort(name,var) \
\
-int EMBPERL_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
+int EMBPERL2_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
sv_setiv (pSV, var) ; \
return 0 ; \
} \
\
- int EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
+ int EMBPERL2_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
var = SvIV (pSV) ; \
return 0 ; \
} \
\
- MGVTBL EMBPERL_mvtTab##name = { EMBPERL_mgGet##name, EMBPERL_mgSet##name, NULL,
NULL, NULL } ;
+ MGVTBL EMBPERL2_mvtTab##name = { EMBPERL2_mgGet##name, EMBPERL2_mgSet##name,
NULL, NULL, NULL } ;
#define INTMGcall(name,var,sub) \
\
-void EMBPERL_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
+void EMBPERL2_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
sv_setiv (pSV, var) ; \
sub ; \
} \
\
- void EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
+ void EMBPERL2_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
var = SvIV (pSV) ; \
sub ; \
} \
\
- MGVTBL EMBPERL_mvtTab##name = { EMBPERL_mgGet##name, EMBPERL_mgSet##name, NULL,
NULL, NULL } ;
+ MGVTBL EMBPERL2_mvtTab##name = { EMBPERL2_mgGet##name, EMBPERL2_mgSet##name,
NULL, NULL, NULL } ;
#define OPTMGRD(name,var) \
\
-int EMBPERL_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
+int EMBPERL2_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
\
@@ -101,18 +101,18 @@
return 0 ; \
} \
\
-int EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
+int EMBPERL2_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
return 0 ; \
} \
\
- MGVTBL EMBPERL_mvtTab##name = { EMBPERL_mgGet##name, EMBPERL_mgSet##name, NULL,
NULL, NULL } ;
+ MGVTBL EMBPERL2_mvtTab##name = { EMBPERL2_mgGet##name, EMBPERL2_mgSet##name,
NULL, NULL, NULL } ;
#define OPTMG(name,var) \
\
-int EMBPERL_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
+int EMBPERL2_mgGet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
\
@@ -120,7 +120,7 @@
return 0 ; \
} \
\
-int EMBPERL_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
+int EMBPERL2_mgSet##name (pTHX_ SV * pSV, MAGIC * mg) \
\
{ \
\
@@ -131,7 +131,7 @@
return 0 ; \
} \
\
- MGVTBL EMBPERL_mvtTab##name = { EMBPERL_mgGet##name, EMBPERL_mgSet##name, NULL,
NULL, NULL } ;
+ MGVTBL EMBPERL2_mvtTab##name = { EMBPERL2_mgGet##name, EMBPERL2_mgSet##name,
NULL, NULL, NULL } ;
1.19.4.19 +14 -2 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.19.4.18
retrieving revision 1.19.4.19
diff -u -r1.19.4.18 -r1.19.4.19
--- epnames.h 12 Mar 2002 09:33:10 -0000 1.19.4.18
+++ epnames.h 20 Mar 2002 06:28:22 -0000 1.19.4.19
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epnames.h,v 1.19.4.18 2002/03/12 09:33:10 richter Exp $
+# $Id: epnames.h,v 1.19.4.19 2002/03/20 06:28:22 richter Exp $
#
###################################################################################*/
@@ -209,7 +209,19 @@
#define xNoName EMBPERL2_xNoName
#define xOrderIndexAttr EMBPERL2_xOrderIndexAttr
#define Escape EMBPERL2_Escape
-
+#define embperl_ApacheAddModule EMBPERL2_ApacheAddModule
+#define EvalRegEx EMBPERL2_EvalRegEx
+#define GetHashValueStrDupA EMBPERL2_GetHashValueStrDupA
+#define GetSessionID EMBPERL2_GetSessionID
+#define LogErrorParam EMBPERL2_LogErrorParam
+#define Node_selfForceLevel EMBPERL2_Node_selfForceLevel
+#define Node_selfLevelItem EMBPERL2_Node_selfLevelItem
+#define dom_free_size EMBPERL2_dom_free_size
+#define SetHashValueInt EMBPERL2_SetHashValueInt
+#define pCacheItems EMBPERL2_pCacheItems
+#define pCachesToRelease EMBPERL2_pCachesToRelease
+#define pProviders EMBPERL2_pProviders
+
#ifndef PERL_VERSION
#include <patchlevel.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
