From 35722e7202d303b4034282b06c77d29446974837 Mon Sep 17 00:00:00 2001 From: Dave Mitchell Date: Thu, 12 Jul 2007 22:10:35 +0000 Subject: [PATCH] really really fix S_emulate_eaccess compiler warning (#31536 didn't) p4raw-id: //depot/perl@31600 --- embed.fnc | 2 +- embed.h | 4 ++-- proto.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/embed.fnc b/embed.fnc index 022b683..da96046 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1351,7 +1351,7 @@ s |void |qsortsvu |NN SV** array|size_t num_elts|NN SVCOMPARE_t compare #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT) s |OP* |doform |NN CV *cv|NN GV *gv|NN OP *retop -# if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) +# if !defined(PERL_EFF_ACCESS) s |int |emulate_eaccess|NN const char* path|Mode_t mode # endif # if !defined(HAS_MKDIR) || !defined(HAS_RMDIR) diff --git a/embed.h b/embed.h index 76d8387..e6accd9 100644 --- a/embed.h +++ b/embed.h @@ -1350,7 +1350,7 @@ #ifdef PERL_CORE #define doform S_doform #endif -# if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) +# if !defined(PERL_EFF_ACCESS) #ifdef PERL_CORE #define emulate_eaccess S_emulate_eaccess #endif @@ -3640,7 +3640,7 @@ #ifdef PERL_CORE #define doform(a,b,c) S_doform(aTHX_ a,b,c) #endif -# if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) +# if !defined(PERL_EFF_ACCESS) #ifdef PERL_CORE #define emulate_eaccess(a,b) S_emulate_eaccess(aTHX_ a,b) #endif diff --git a/proto.h b/proto.h index a519ef2..8d71dae 100644 --- a/proto.h +++ b/proto.h @@ -3641,7 +3641,7 @@ STATIC OP* S_doform(pTHX_ CV *cv, GV *gv, OP *retop) __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_3); -# if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) +# if !defined(PERL_EFF_ACCESS) STATIC int S_emulate_eaccess(pTHX_ const char* path, Mode_t mode) __attribute__nonnull__(pTHX_1); -- 2.7.4