summaryrefslogtreecommitdiff
path: root/perlapi.h
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-04-30 23:01:07 +0100
committerNicholas Clark <nick@ccl4.org>2011-06-12 16:15:21 +0200
commit58f645e20791a7788fcb38189895a712d5c53419 (patch)
tree768a485e3238e8b68abbf92cefed82fcb253b446 /perlapi.h
parent8790f825d5f6ff0beed9873a34e145cf35e3ce5c (diff)
downloadperl-58f645e20791a7788fcb38189895a712d5c53419.tar.gz
Move PL_{No,Yes,hexdigit} from perlvars.h to perl.h, as all are const char[]
They were converted in perl.h from const char[] to #define in 31fb120917c4f65d, then re-instated as const char[], but in perlvars.h, in 3fe35a814d0a98f4. There's no need for compile-time constants to jump through the hoops of perlvars.h, even for Symbian, as the various "EXTCONST" variables already in perl.h demonstrate. These were the only 3 users of the the PERLVARISC macro, so eliminate that, and all related code.
Diffstat (limited to 'perlapi.h')
-rw-r--r--perlapi.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/perlapi.h b/perlapi.h
index 2842fc6606..fcbc440276 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -28,14 +28,11 @@ START_EXTERN_C
#undef PERLVARA
#undef PERLVARI
#undef PERLVARIC
-#undef PERLVARISC
#define PERLVAR(v,t) EXTERN_C t* Perl_##v##_ptr(pTHX);
#define PERLVARA(v,n,t) typedef t PL_##v##_t[n]; \
EXTERN_C PL_##v##_t* Perl_##v##_ptr(pTHX);
#define PERLVARI(v,t,i) PERLVAR(v,t)
#define PERLVARIC(v,t,i) PERLVAR(v, const t)
-#define PERLVARISC(v,i) typedef const char PL_##v##_t[sizeof(i)]; \
- EXTERN_C PL_##v##_t* Perl_##v##_ptr(pTHX);
#include "perlvars.h"
@@ -43,7 +40,6 @@ START_EXTERN_C
#undef PERLVARA
#undef PERLVARI
#undef PERLVARIC
-#undef PERLVARISC
END_EXTERN_C
@@ -70,7 +66,6 @@ EXTCONST void * const PL_force_link_funcs[] = {
#define PERLVARA(v,n,t) PERLVAR(v,t)
#define PERLVARI(v,t,i) PERLVAR(v,t)
#define PERLVARIC(v,t,i) PERLVAR(v,t)
-#define PERLVARISC(v,i) PERLVAR(v,char)
/* In Tru64 (__DEC && __osf__) the cc option -std1 causes that one
* cannot cast between void pointers and function pointers without
@@ -95,7 +90,6 @@ EXTCONST void * const PL_force_link_funcs[] = {
#undef PERLVARA
#undef PERLVARI
#undef PERLVARIC
-#undef PERLVARISC
};
#endif /* DOINIT */
@@ -105,10 +99,6 @@ END_EXTERN_C
#else /* !PERL_CORE */
-#undef PL_No
-#define PL_No (*Perl_GNo_ptr(NULL))
-#undef PL_Yes
-#define PL_Yes (*Perl_GYes_ptr(NULL))
#undef PL_appctx
#define PL_appctx (*Perl_Gappctx_ptr(NULL))
#undef PL_check
@@ -125,8 +115,6 @@ END_EXTERN_C
#define PL_fold_locale (*Perl_Gfold_locale_ptr(NULL))
#undef PL_global_struct_size
#define PL_global_struct_size (*Perl_Gglobal_struct_size_ptr(NULL))
-#undef PL_hexdigit
-#define PL_hexdigit (*Perl_Ghexdigit_ptr(NULL))
#undef PL_hints_mutex
#define PL_hints_mutex (*Perl_Ghints_mutex_ptr(NULL))
#undef PL_interp_size