From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 26 Nov 2008 23:20:31 +0000 (+0000)
Subject: setenv_getix() is not used anywhere other than util.c (and the "special
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=051b305ded17acbcebcc33237adf2a68c22c2001;p=p5sagit%2Fp5-mst-13.2.git

setenv_getix() is not used anywhere other than util.c (and the "special
biologist word for stable" Msql-Mysql-modules-1.2219) so make it
static.

p4raw-id: //depot/perl@34940
---

diff --git a/embed.fnc b/embed.fnc
index 41fa2a1..0edc28a 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -839,8 +839,8 @@ Apd	|NV	|scan_oct	|NN const char* start|STRLEN len|NN STRLEN* retlen
 p	|OP*	|scope		|NULLOK OP* o
 Ap	|char*	|screaminstr	|NN SV *bigstr|NN SV *littlestr|I32 start_shift \
 				|I32 end_shift|NN I32 *old_posp|I32 last
-#if !defined(VMS)
-p	|I32	|setenv_getix	|NN const char* nam
+#if !defined(VMS) && defined(PERL_IN_UTIL_C)
+s	|I32	|setenv_getix	|NN const char* nam
 #endif
 Apd	|void	|setdefout	|NULLOK GV* gv
 Ap	|HEK*	|share_hek	|NN const char* str|I32 len|U32 hash
diff --git a/embed.h b/embed.h
index c227492..2ac8d07 100644
--- a/embed.h
+++ b/embed.h
@@ -838,9 +838,9 @@
 #define scope			Perl_scope
 #endif
 #define screaminstr		Perl_screaminstr
-#if !defined(VMS)
+#if !defined(VMS) && defined(PERL_IN_UTIL_C)
 #ifdef PERL_CORE
-#define setenv_getix		Perl_setenv_getix
+#define setenv_getix		S_setenv_getix
 #endif
 #endif
 #define setdefout		Perl_setdefout
@@ -3185,9 +3185,9 @@
 #define scope(a)		Perl_scope(aTHX_ a)
 #endif
 #define screaminstr(a,b,c,d,e,f)	Perl_screaminstr(aTHX_ a,b,c,d,e,f)
-#if !defined(VMS)
+#if !defined(VMS) && defined(PERL_IN_UTIL_C)
 #ifdef PERL_CORE
-#define setenv_getix(a)		Perl_setenv_getix(aTHX_ a)
+#define setenv_getix(a)		S_setenv_getix(aTHX_ a)
 #endif
 #endif
 #define setdefout(a)		Perl_setdefout(aTHX_ a)
diff --git a/proto.h b/proto.h
index 3148a83..0ce5a27 100644
--- a/proto.h
+++ b/proto.h
@@ -2961,8 +2961,8 @@ PERL_CALLCONV char*	Perl_screaminstr(pTHX_ SV *bigstr, SV *littlestr, I32 start_
 #define PERL_ARGS_ASSERT_SCREAMINSTR	\
 	assert(bigstr); assert(littlestr); assert(old_posp)
 
-#if !defined(VMS)
-PERL_CALLCONV I32	Perl_setenv_getix(pTHX_ const char* nam)
+#if !defined(VMS) && defined(PERL_IN_UTIL_C)
+STATIC I32	S_setenv_getix(pTHX_ const char* nam)
 			__attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_SETENV_GETIX	\
 	assert(nam)
diff --git a/util.c b/util.c
index 06d7bb1..67d0a13 100644
--- a/util.c
+++ b/util.c
@@ -1774,8 +1774,8 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val)
 #endif /* WIN32 || NETWARE */
 
 #ifndef PERL_MICRO
-I32
-Perl_setenv_getix(pTHX_ const char *nam)
+static I32
+S_setenv_getix(pTHX_ const char *nam)
 {
     register I32 i;
     register const I32 len = strlen(nam);