Change 30312 by [EMAIL PROTECTED] on 2007/02/15 12:28:42
Integrate:
[ 28643]
Silence a couple of Borland compiler warnings
[ 28769]
Silence some more Borland compiler warnings
(See: http://www.nntp.perl.org/group/perl.daily-build.reports/40471)
- Change the cryptic pragma warn strings into numbers that are more
easily recognized, and add a new one (8027).
- Add a similar pragma warn line to fcrypt.c, which doesn't use
win32.h.
[ 29155]
Initial cleanups to support compiling Win32 with MinGW g++.
[ 29692]
Silence various VC6 warnings
Affected files ...
... //depot/maint-5.8/perl/cop.h#37 integrate
... //depot/maint-5.8/perl/ext/B/B.xs#29 integrate
... //depot/maint-5.8/perl/perlio.c#108 integrate
... //depot/maint-5.8/perl/regexec.c#88 integrate
... //depot/maint-5.8/perl/util.c#147 integrate
... //depot/maint-5.8/perl/win32/fcrypt.c#3 integrate
... //depot/maint-5.8/perl/win32/win32.c#34 integrate
... //depot/maint-5.8/perl/win32/win32.h#15 integrate
Differences ...
==== //depot/maint-5.8/perl/cop.h#37 (text) ====
Index: perl/cop.h
--- perl/cop.h#36~30292~ 2007-02-14 09:29:10.000000000 -0800
+++ perl/cop.h 2007-02-15 04:28:42.000000000 -0800
@@ -625,7 +625,7 @@
cx->sb_rx = rx, \
cx->cx_type = CXt_SUBST; \
rxres_save(&cx->sb_rxres, rx); \
- ReREFCNT_inc(rx)
+ (void)ReREFCNT_inc(rx)
#define POPSUBST(cx) cx = &cxstack[cxstack_ix--]; \
rxres_free(&cx->sb_rxres); \
==== //depot/maint-5.8/perl/ext/B/B.xs#29 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs#28~30295~ 2007-02-14 10:04:52.000000000 -0800
+++ perl/ext/B/B.xs 2007-02-15 04:28:42.000000000 -0800
@@ -1394,7 +1394,7 @@
BmUSEFUL(sv)
B::BM sv
-U16
+U32
BmPREVIOUS(sv)
B::BM sv
==== //depot/maint-5.8/perl/perlio.c#108 (text) ====
Index: perl/perlio.c
--- perl/perlio.c#107~30295~ 2007-02-14 10:04:52.000000000 -0800
+++ perl/perlio.c 2007-02-15 04:28:42.000000000 -0800
@@ -3363,7 +3363,7 @@
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
if (ptr != NULL) {
#ifdef STDIO_PTR_LVALUE
- PerlSIO_set_ptr(stdio, (void*)ptr); /* LHS STDCHAR* cast non-portable */
+ PerlSIO_set_ptr(stdio, ptr); /* LHS STDCHAR* cast non-portable */
#ifdef STDIO_PTR_LVAL_SETS_CNT
if (PerlSIO_get_cnt(stdio) != (cnt)) {
assert(PerlSIO_get_cnt(stdio) == (cnt));
==== //depot/maint-5.8/perl/win32/fcrypt.c#3 (text) ====
Index: perl/win32/fcrypt.c
--- perl/win32/fcrypt.c#2~25551~ 2005-09-21 11:21:10.000000000 -0700
+++ perl/win32/fcrypt.c 2007-02-15 04:28:42.000000000 -0800
@@ -9,6 +9,10 @@
* [EMAIL PROTECTED]
*/
+#if defined(__BORLANDC__)
+#pragma warn -8004 /* "'foo' is assigned a value that is never used" */
+#endif
+
typedef unsigned char des_cblock[8];
typedef struct des_ks_struct
==== //depot/maint-5.8/perl/win32/win32.c#34 (text) ====
Index: perl/win32/win32.c
--- perl/win32/win32.c#33~30311~ 2007-02-15 03:24:02.000000000 -0800
+++ perl/win32/win32.c 2007-02-15 04:28:42.000000000 -0800
@@ -1062,7 +1062,6 @@
win32_kill(int pid, int sig)
{
dTHX;
- HANDLE hProcess;
long child;
int retval;
#ifdef USE_ITHREADS
@@ -1070,7 +1069,7 @@
/* it is a pseudo-forked child */
child = find_pseudo_pid(-pid);
if (child >= 0) {
- hProcess = w32_pseudo_child_handles[child];
+ HANDLE hProcess = w32_pseudo_child_handles[child];
switch (sig) {
case 0:
/* "Does process exist?" use of kill */
==== //depot/maint-5.8/perl/win32/win32.h#15 (text) ====
Index: perl/win32/win32.h
--- perl/win32/win32.h#14~30311~ 2007-02-15 03:24:02.000000000 -0800
+++ perl/win32/win32.h 2007-02-15 04:28:42.000000000 -0800
@@ -182,14 +182,15 @@
#define DllMain DllEntryPoint
#endif
-#pragma warn -ccc /* "condition is always true/false" */
-#pragma warn -rch /* "unreachable code" */
-#pragma warn -sig /* "conversion may lose significant digits" */
-#pragma warn -pia /* "possibly incorrect assignment" */
-#pragma warn -par /* "parameter 'foo' is never used" */
-#pragma warn -aus /* "'foo' is assigned a value that is never used" */
-#pragma warn -use /* "'foo' is declared but never used" */
-#pragma warn -csu /* "comparing signed and unsigned values" */
+#pragma warn -8004 /* "'foo' is assigned a value that is never used" */
+#pragma warn -8008 /* "condition is always true/false" */
+#pragma warn -8012 /* "comparing signed and unsigned values" */
+#pragma warn -8027 /* "functions containing %s are not expanded inline" */
+#pragma warn -8057 /* "parameter 'foo' is never used" */
+#pragma warn -8060 /* "possibly incorrect assignment" */
+#pragma warn -8066 /* "unreachable code" */
+#pragma warn -8071 /* "conversion may lose significant digits" */
+#pragma warn -8080 /* "'foo' is declared but never used" */
/* Borland C thinks that a pointer to a member variable is 12 bytes in size. */
#define PERL_MEMBER_PTR_SIZE 12
End of Patch.
