summaryrefslogtreecommitdiff
path: root/NetWare
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-08-07 21:09:03 +0200
committerNicholas Clark <nick@ccl4.org>2011-08-11 11:38:46 +0200
commit115ff745268490ae5fb5ecaee00be54172e302e0 (patch)
tree18788de5ba03a4598d0cdd3b776e2dd257df050f /NetWare
parente469e61f2b416389b7fb67acaf0d21735066e6ee (diff)
downloadperl-115ff745268490ae5fb5ecaee00be54172e302e0.tar.gz
Simplify embedvar.h, removing a level of macro indirection for PL_* variables.
For the default (non-multiplicity) configuration, PERLVAR*() macros now directly expand their arguments to tokens such as C<PL_defgv>, instead of expanding to C<PL_Idefgv>. This removes over 350 lines from F<embedvar.h>, which defined macros to map from C<PL_Idefgv> to C<PL_defgv> and so forth.
Diffstat (limited to 'NetWare')
-rw-r--r--NetWare/interface.c8
-rw-r--r--NetWare/interface.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/NetWare/interface.c b/NetWare/interface.c
index 0788e3aab8..2cdadca2fa 100644
--- a/NetWare/interface.c
+++ b/NetWare/interface.c
@@ -126,10 +126,10 @@ int RunPerl(int argc, char **argv, char **env)
PerlInterpreter *new_perl = NULL; // defined in Perl.h
#ifdef PERL_GLOBAL_STRUCT
- #define PERLVAR(var,type)
- #define PERLVARA(var,type)
- #define PERLVARI(var,type,init) PL_Vars.var = init;
- #define PERLVARIC(var,type,init) PL_Vars.var = init;
+ #define PERLVAR(prefix,var,type)
+ #define PERLVARA(prefix,var,type)
+ #define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init;
+ #define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init;
#include "perlvars.h"
diff --git a/NetWare/interface.cpp b/NetWare/interface.cpp
index b0f3cb3328..47fef6709c 100644
--- a/NetWare/interface.cpp
+++ b/NetWare/interface.cpp
@@ -120,10 +120,10 @@ int RunPerl(int argc, char **argv, char **env)
//__asm{int 3};
#ifdef PERL_GLOBAL_STRUCT
- #define PERLVAR(var,type)
- #define PERLVARA(var,type)
- #define PERLVARI(var,type,init) PL_Vars.var = init;
- #define PERLVARIC(var,type,init) PL_Vars.var = init;
+ #define PERLVAR(prefix,var,type)
+ #define PERLVARA(prefix,var,type)
+ #define PERLVARI(prefix,var,type,init) PL_Vars.prefix##var = init;
+ #define PERLVARIC(prefix,var,type,init) PL_Vars.prefix##var = init;
#include "perlvars.h"