Change 30020 by [EMAIL PROTECTED] on 2007/01/26 19:03:49

        Fix up files by re-running embed.pl
        I've no idea why these weren't correct to start with, as it all passed
        make test on saigo.

Affected files ...

... //depot/maint-5.8/perl/global.sym#57 edit
... //depot/maint-5.8/perl/proto.h#188 edit

Differences ...

==== //depot/maint-5.8/perl/global.sym#57 (text+w) ====
Index: perl/global.sym
--- perl/global.sym#56~30007~   2007-01-26 05:50:55.000000000 -0800
+++ perl/global.sym     2007-01-26 11:03:49.000000000 -0800
@@ -734,11 +734,11 @@
 Perl_gv_SVadd
 Perl_ckwarn
 Perl_ckwarn_d
+Perl_my_strlcat
+Perl_my_strlcpy
 Perl_gv_fetchpvn_flags
 Perl_gv_fetchsv
 Perl_my_sprintf
 Perl_my_snprintf
 Perl_my_vsnprintf
-Perl_my_strlcat
-Perl_my_strlcpy
 # ex: set ro:

==== //depot/maint-5.8/perl/proto.h#188 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#187~30007~     2007-01-26 05:50:55.000000000 -0800
+++ perl/proto.h        2007-01-26 11:03:49.000000000 -0800
@@ -288,9 +288,7 @@
 #endif
 PERL_CALLCONV void     Perl_do_execfree(pTHX);
 #ifdef PERL_IN_DOIO_C
-STATIC void    S_exec_failed(pTHX_ const char *cmd, int fd, int do_report)
-                       __attribute__nonnull__(pTHX_1);
-
+STATIC void    S_exec_failed(pTHX_ const char *cmd, int fd, int do_report);
 #endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 PERL_CALLCONV I32      Perl_do_ipcctl(pTHX_ I32 optype, SV** mark, SV** sp);
@@ -2317,15 +2315,6 @@
 PERL_CALLCONV OP*      Perl_ck_require(pTHX_ OP *o)
                        __attribute__warn_unused_result__;
 
-PERL_CALLCONV int      Perl_my_snprintf(char *buffer, const Size_t len, const 
char *format, ...)
-                       __attribute__nonnull__(1)
-                       __attribute__nonnull__(3);
-
-PERL_CALLCONV int      Perl_my_vsnprintf(char *buffer, const Size_t len, const 
char *format, va_list ap)
-                       __attribute__nonnull__(1)
-                       __attribute__nonnull__(3);
-
-
 PERL_CALLCONV OP*      Perl_ck_return(pTHX_ OP *o)
                        __attribute__warn_unused_result__;
 
@@ -2335,14 +2324,6 @@
 PERL_CALLCONV OP*      Perl_ck_rvconst(pTHX_ OP *o)
                        __attribute__warn_unused_result__;
 
-#ifndef HAS_STRLCAT
-PERL_CALLCONV Size_t   Perl_my_strlcat(char *dst, const char *src, Size_t 
size);
-#endif
-
-#ifndef HAS_STRLCPY
-PERL_CALLCONV Size_t   Perl_my_strlcpy(char *dst, const char *src, Size_t 
size);
-#endif
-
 PERL_CALLCONV OP*      Perl_ck_sassign(pTHX_ OP *o)
                        __attribute__warn_unused_result__;
 
@@ -2401,6 +2382,14 @@
 
 PERL_CALLCONV void     Perl_my_clearenv(pTHX);
 
+#ifndef HAS_STRLCAT
+PERL_CALLCONV Size_t   Perl_my_strlcat(char *dst, const char *src, Size_t 
size);
+#endif
+
+#ifndef HAS_STRLCPY
+PERL_CALLCONV Size_t   Perl_my_strlcpy(char *dst, const char *src, Size_t 
size);
+#endif
+
 PERL_CALLCONV GV*      Perl_gv_fetchpvn_flags(pTHX_ const char* name, STRLEN 
len, I32 flags, I32 sv_type);
 PERL_CALLCONV GV*      Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, I32 sv_type);
 PERL_CALLCONV bool     Perl_is_gv_magical_sv(pTHX_ SV *name, U32 flags);
@@ -2409,6 +2398,11 @@
 PERL_CALLCONV int      Perl_my_sprintf(char *buffer, const char *pat, ...);
 #endif
 
+PERL_CALLCONV int      Perl_my_snprintf(char *buffer, const Size_t len, const 
char *format, ...)
+                       __attribute__format__(__printf__,3,4);
+
+PERL_CALLCONV int      Perl_my_vsnprintf(char *buffer, const Size_t len, const 
char *format, va_list ap);
+
 END_EXTERN_C
 /*
  * ex: set ts=8 sts=4 sw=4 noet:
End of Patch.

Reply via email to