summaryrefslogtreecommitdiff
path: root/embed.h
diff options
context:
space:
mode:
authorNick Ing-Simmons <nik@tiuk.ti.com>2001-06-14 08:22:29 +0000
committerNick Ing-Simmons <nik@tiuk.ti.com>2001-06-14 08:22:29 +0000
commit2d31dd6aa775ba3ae596182dab64c54df2e34ba1 (patch)
tree98243c2172d94695a828ce4c2e78ee9c73347c32 /embed.h
parent24e8cdb889e0ad40169b18813ffa9d1841ab8217 (diff)
downloadperl-2d31dd6aa775ba3ae596182dab64c54df2e34ba1.tar.gz
Integrate mainline
p4raw-id: //depot/perlio@10585
Diffstat (limited to 'embed.h')
-rw-r--r--embed.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/embed.h b/embed.h
index 1191893fb4..40077b2787 100644
--- a/embed.h
+++ b/embed.h
@@ -1170,8 +1170,10 @@
#if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
#define isa_lookup S_isa_lookup
#endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
#define stdize_locale S_stdize_locale
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
#define mess_alloc S_mess_alloc
# if defined(LEAKTEST)
#define xstat S_xstat
@@ -2665,8 +2667,10 @@
#if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
#define isa_lookup(a,b,c,d) S_isa_lookup(aTHX_ a,b,c,d)
#endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
#define stdize_locale(a) S_stdize_locale(aTHX_ a)
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
#define mess_alloc() S_mess_alloc(aTHX)
# if defined(LEAKTEST)
#define xstat(a) S_xstat(aTHX_ a)
@@ -5182,9 +5186,11 @@
#define S_isa_lookup CPerlObj::S_isa_lookup
#define isa_lookup S_isa_lookup
#endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
#define S_stdize_locale CPerlObj::S_stdize_locale
#define stdize_locale S_stdize_locale
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
#define S_mess_alloc CPerlObj::S_mess_alloc
#define mess_alloc S_mess_alloc
# if defined(LEAKTEST)