Change 34592 by [EMAIL PROTECTED] on 2008/10/25 15:39:32
Integrate:
[ 34575]
Make C++ compilers happy #2: const POD without initializer
is an error for g++, even when static.
[ 34579]
Make C++ compilers happy #5: jump to 'do_write' crossed
initialization in dTHX.
Plus some consting, which also makes C++ happier.
Affected files ...
... //depot/maint-5.10/perl/malloc.c#6 integrate
... //depot/maint-5.10/perl/perl.c#19 integrate
Differences ...
==== //depot/maint-5.10/perl/malloc.c#6 (text) ====
Index: perl/malloc.c
--- perl/malloc.c#5~34263~ 2008-09-04 01:55:53.000000000 -0700
+++ perl/malloc.c 2008-10-25 08:39:32.000000000 -0700
@@ -970,7 +970,7 @@
static void morecore (register int bucket);
# if defined(DEBUGGING)
-static void botch (char *diag, char *s, char *file, int line);
+static void botch (const char *diag, const char *s, const char
*file, int line);
# endif
static void add_to_chain (void *p, MEM_SIZE size, MEM_SIZE chip);
static void* get_from_chain (MEM_SIZE size);
@@ -1281,7 +1281,7 @@
#endif /* defined PERL_EMERGENCY_SBRK */
static void
-write2(char *mess)
+write2(const char *mess)
{
write(2, mess, strlen(mess));
}
@@ -1291,13 +1291,13 @@
#define ASSERT(p,diag) if (!(p))
botch(diag,STRINGIFY(p),__FILE__,__LINE__);
static void
-botch(char *diag, char *s, char *file, int line)
+botch(const char *diag, const char *s, const char *file, int line)
{
dVAR;
+ dTHX;
if (!(PERL_MAYBE_ALIVE && PERL_GET_THX))
goto do_write;
else {
- dTHX;
if (PerlIO_printf(PerlIO_stderr(),
"assertion botched (%s?): %s %s:%d\n",
diag, s, file, line) != 0) {
==== //depot/maint-5.10/perl/perl.c#19 (text) ====
Index: perl/perl.c
--- perl/perl.c#18~34533~ 2008-10-20 09:11:30.000000000 -0700
+++ perl/perl.c 2008-10-25 08:39:32.000000000 -0700
@@ -644,7 +644,7 @@
int f;
const char *where;
/* Our success message is an integer 0, and a char 0 */
- static const char success[sizeof(int) + 1];
+ static const char success[sizeof(int) + 1] = {0};
close(fd[0]);
End of Patch.
