Change 34925 by [EMAIL PROTECTED] on 2008/11/26 19:58:49
ingroup() is only used in doio.c.
Wrap gen_constant_list in #if defined(PERL_IN_OP_C)
Affected files ...
... //depot/perl/doio.c#376 edit
... //depot/perl/embed.fnc#639 edit
... //depot/perl/embed.h#776 edit
... //depot/perl/proto.h#973 edit
Differences ...
==== //depot/perl/doio.c#376 (text) ====
Index: perl/doio.c
--- perl/doio.c#375~34698~ 2008-11-02 13:12:59.000000000 -0800
+++ perl/doio.c 2008-11-26 11:58:49.000000000 -0800
@@ -1944,7 +1944,7 @@
#endif /* ! VMS */
bool
-Perl_ingroup(pTHX_ Gid_t testgid, bool effective)
+S_ingroup(pTHX_ Gid_t testgid, bool effective)
{
#ifdef MACOS_TRADITIONAL
/* This is simply not correct for AppleShare, but fix it yerself. */
==== //depot/perl/embed.fnc#639 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#638~34924~ 2008-11-26 11:36:06.000000000 -0800
+++ perl/embed.fnc 2008-11-26 11:58:49.000000000 -0800
@@ -280,7 +280,9 @@
Afpd |char* |form |NN const char* pat|...
Ap |char* |vform |NN const char* pat|NULLOK va_list* args
Ap |void |free_tmps
+#if defined(PERL_IN_OP_C)
s |OP* |gen_constant_list|NULLOK OP* o
+#endif
#if !defined(HAS_GETENV_LEN)
p |char* |getenv_len |NN const char *env_elem|NN unsigned long *len
#endif
@@ -370,7 +372,9 @@
Apd |I32 |ibcmp_utf8 |NN const char *s1|NULLOK char **pe1|UV l1 \
|bool u1|NN const char *s2|NULLOK char **pe2 \
|UV l2|bool u2
-pR |bool |ingroup |Gid_t testgid|bool effective
+#if defined(PERL_IN_DOIO_C)
+sR |bool |ingroup |Gid_t testgid|bool effective
+#endif
p |void |init_argv_symbols|int argc|NN char **argv
p |void |init_debugger
Ap |void |init_stacks
==== //depot/perl/embed.h#776 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#775~34924~ 2008-11-26 11:36:06.000000000 -0800
+++ perl/embed.h 2008-11-26 11:58:49.000000000 -0800
@@ -257,9 +257,11 @@
#define form Perl_form
#define vform Perl_vform
#define free_tmps Perl_free_tmps
+#if defined(PERL_IN_OP_C)
#ifdef PERL_CORE
#define gen_constant_list S_gen_constant_list
#endif
+#endif
#if !defined(HAS_GETENV_LEN)
#ifdef PERL_CORE
#define getenv_len Perl_getenv_len
@@ -309,8 +311,12 @@
#define ibcmp Perl_ibcmp
#define ibcmp_locale Perl_ibcmp_locale
#define ibcmp_utf8 Perl_ibcmp_utf8
+#if defined(PERL_IN_DOIO_C)
+#ifdef PERL_CORE
+#define ingroup S_ingroup
+#endif
+#endif
#ifdef PERL_CORE
-#define ingroup Perl_ingroup
#define init_argv_symbols Perl_init_argv_symbols
#define init_debugger Perl_init_debugger
#endif
@@ -2573,9 +2579,11 @@
#endif
#define vform(a,b) Perl_vform(aTHX_ a,b)
#define free_tmps() Perl_free_tmps(aTHX)
+#if defined(PERL_IN_OP_C)
#ifdef PERL_CORE
#define gen_constant_list(a) S_gen_constant_list(aTHX_ a)
#endif
+#endif
#if !defined(HAS_GETENV_LEN)
#ifdef PERL_CORE
#define getenv_len(a,b) Perl_getenv_len(aTHX_ a,b)
@@ -2637,8 +2645,12 @@
#define ibcmp(a,b,c) Perl_ibcmp(aTHX_ a,b,c)
#define ibcmp_locale(a,b,c) Perl_ibcmp_locale(aTHX_ a,b,c)
#define ibcmp_utf8(a,b,c,d,e,f,g,h) Perl_ibcmp_utf8(aTHX_ a,b,c,d,e,f,g,h)
+#if defined(PERL_IN_DOIO_C)
+#ifdef PERL_CORE
+#define ingroup(a,b) S_ingroup(aTHX_ a,b)
+#endif
+#endif
#ifdef PERL_CORE
-#define ingroup(a,b) Perl_ingroup(aTHX_ a,b)
#define init_argv_symbols(a,b) Perl_init_argv_symbols(aTHX_ a,b)
#define init_debugger() Perl_init_debugger(aTHX)
#endif
==== //depot/perl/proto.h#973 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#972~34924~ 2008-11-26 11:36:06.000000000 -0800
+++ perl/proto.h 2008-11-26 11:58:49.000000000 -0800
@@ -818,7 +818,9 @@
assert(pat)
PERL_CALLCONV void Perl_free_tmps(pTHX);
+#if defined(PERL_IN_OP_C)
STATIC OP* S_gen_constant_list(pTHX_ OP* o);
+#endif
#if !defined(HAS_GETENV_LEN)
PERL_CALLCONV char* Perl_getenv_len(pTHX_ const char *env_elem, unsigned
long *len)
__attribute__nonnull__(pTHX_1)
@@ -1112,9 +1114,11 @@
#define PERL_ARGS_ASSERT_IBCMP_UTF8 \
assert(s1); assert(s2)
-PERL_CALLCONV bool Perl_ingroup(pTHX_ Gid_t testgid, bool effective)
+#if defined(PERL_IN_DOIO_C)
+STATIC bool S_ingroup(pTHX_ Gid_t testgid, bool effective)
__attribute__warn_unused_result__;
+#endif
PERL_CALLCONV void Perl_init_argv_symbols(pTHX_ int argc, char **argv)
__attribute__nonnull__(pTHX_2);
#define PERL_ARGS_ASSERT_INIT_ARGV_SYMBOLS \
End of Patch.
