Change 33370 by [EMAIL PROTECTED] on 2008/02/25 17:42:38
Silence Borland compiler warnings (except for warnings from zlib) here:
http://www.nntp.perl.org/group/perl.daily-build.reports/2008/02/msg53937.html
Affected files ...
... //depot/perl/NetWare/nwperlhost.h#5 edit
... //depot/perl/NetWare/nwperlsys.h#9 edit
... //depot/perl/ext/Time/Piece/Piece.pm#16 edit
... //depot/perl/ext/Time/Piece/Piece.xs#13 edit
... //depot/perl/ext/Win32/Win32.pm#13 edit
... //depot/perl/ext/Win32/Win32.xs#9 edit
... //depot/perl/generate_uudmap.c#3 edit
... //depot/perl/iperlsys.h#70 edit
... //depot/perl/perl.h#829 edit
... //depot/perl/perlio.c#381 edit
... //depot/perl/perliol.h#47 edit
... //depot/perl/perly.c#114 edit
... //depot/perl/regcomp.c#652 edit
... //depot/perl/win32/perlhost.h#73 edit
... //depot/perl/win32/win32.c#296 edit
Differences ...
==== //depot/perl/NetWare/nwperlhost.h#5 (text) ====
Index: perl/NetWare/nwperlhost.h
--- perl/NetWare/nwperlhost.h#4~32713~ 2007-12-22 16:39:17.000000000 -0800
+++ perl/NetWare/nwperlhost.h 2008-02-25 09:42:38.000000000 -0800
@@ -441,7 +441,7 @@
return nw_getc((FILE*)pf);
}
-char*
+STDCHAR*
PerlStdIOGetBase(struct IPerlStdIO* piPerl, PerlIO* pf)
{
#ifdef FILE_base
@@ -474,7 +474,7 @@
#endif
}
-char*
+STDCHAR*
PerlStdIOGetPtr(struct IPerlStdIO* piPerl, PerlIO* pf)
{
#ifdef USE_STDIO_PTR
@@ -568,7 +568,7 @@
}
void
-PerlStdIOSetPtrCnt(struct IPerlStdIO* piPerl, PerlIO* pf, char * ptr, int n)
+PerlStdIOSetPtrCnt(struct IPerlStdIO* piPerl, PerlIO* pf, STDCHAR * ptr, int n)
{
#ifdef STDIO_PTR_LVALUE
FILE *f = (FILE*)pf;
==== //depot/perl/NetWare/nwperlsys.h#9 (text) ====
Index: perl/NetWare/nwperlsys.h
--- perl/NetWare/nwperlsys.h#8~32713~ 2007-12-22 16:39:17.000000000 -0800
+++ perl/NetWare/nwperlsys.h 2008-02-25 09:42:38.000000000 -0800
@@ -335,7 +335,7 @@
return nw_getc(pf);
}
-char*
+STDCHAR*
PerlStdIOGetBase(struct IPerlStdIO* piPerl, FILE* pf)
{
#ifdef FILE_base
@@ -368,7 +368,7 @@
#endif
}
-char*
+STDCHAR*
PerlStdIOGetPtr(struct IPerlStdIO* piPerl, FILE* pf)
{
#ifdef USE_STDIO_PTR
@@ -461,7 +461,7 @@
}
void
-PerlStdIOSetPtr(struct IPerlStdIO* piPerl, FILE* pf, char * ptr)
+PerlStdIOSetPtr(struct IPerlStdIO* piPerl, FILE* pf, STDCHAR * ptr)
{
#ifdef STDIO_PTR_LVALUE
FILE *f = pf;
==== //depot/perl/ext/Time/Piece/Piece.pm#16 (text) ====
Index: perl/ext/Time/Piece/Piece.pm
--- perl/ext/Time/Piece/Piece.pm#15~32420~ 2007-11-20 07:21:56.000000000
-0800
+++ perl/ext/Time/Piece/Piece.pm 2008-02-25 09:42:38.000000000 -0800
@@ -22,7 +22,7 @@
':override' => 'internal',
);
-our $VERSION = '1.12';
+our $VERSION = '1.12_01';
bootstrap Time::Piece $VERSION;
==== //depot/perl/ext/Time/Piece/Piece.xs#13 (text) ====
Index: perl/ext/Time/Piece/Piece.xs
--- perl/ext/Time/Piece/Piece.xs#12~32069~ 2007-10-08 06:16:44.000000000
-0700
+++ perl/ext/Time/Piece/Piece.xs 2008-02-25 09:42:38.000000000 -0800
@@ -245,8 +245,12 @@
#define strncasecmp(x,y,n) strnicmp(x,y,n)
#if defined(WIN32)
+#if defined(__BORLANDC__)
+void * __cdecl _EXPFUNC alloca(_SIZE_T __size);
+#else
#define alloca _alloca
#endif
+#endif
#include <time.h>
#include <ctype.h>
==== //depot/perl/ext/Win32/Win32.pm#13 (text) ====
Index: perl/ext/Win32/Win32.pm
--- perl/ext/Win32/Win32.pm#12~32445~ 2007-11-21 23:09:59.000000000 -0800
+++ perl/ext/Win32/Win32.pm 2008-02-25 09:42:38.000000000 -0800
@@ -8,7 +8,7 @@
require DynaLoader;
@ISA = qw|Exporter DynaLoader|;
- $VERSION = '0.34';
+ $VERSION = '0.34_01';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
==== //depot/perl/ext/Win32/Win32.xs#9 (text) ====
Index: perl/ext/Win32/Win32.xs
--- perl/ext/Win32/Win32.xs#8~32822~ 2008-01-03 17:22:22.000000000 -0800
+++ perl/ext/Win32/Win32.xs 2008-02-25 09:42:38.000000000 -0800
@@ -37,7 +37,7 @@
DWORD, DWORD, DWORD,
DWORD, DWORD, DWORD, PSID*);
typedef BOOL (__stdcall *PFNEqualSid)(PSID, PSID);
typedef void* (__stdcall *PFNFreeSid)(PSID);
-typedef BOOL (__stdcall *PFNIsUserAnAdmin)();
+typedef BOOL (__stdcall *PFNIsUserAnAdmin)(void);
#ifndef CSIDL_MYMUSIC
# define CSIDL_MYMUSIC 0x000D
==== //depot/perl/generate_uudmap.c#3 (text) ====
Index: perl/generate_uudmap.c
--- perl/generate_uudmap.c#2~31068~ 2007-04-25 02:32:50.000000000 -0700
+++ perl/generate_uudmap.c 2008-02-25 09:42:38.000000000 -0800
@@ -14,7 +14,7 @@
char *p;
for (i = 0; i < sizeof(PL_uuemap) - 1; ++i)
- PL_uudmap[(U8)PL_uuemap[i]] = i;
+ PL_uudmap[(U8)PL_uuemap[i]] = (char)i;
/*
* Because ' ' and '`' map to the same value,
* we need to decode them both the same.
==== //depot/perl/iperlsys.h#70 (text) ====
Index: perl/iperlsys.h
--- perl/iperlsys.h#69~32793~ 2008-01-01 09:18:13.000000000 -0800
+++ perl/iperlsys.h 2008-02-25 09:42:38.000000000 -0800
@@ -73,10 +73,10 @@
typedef int (*LPError)(struct IPerlStdIO*, FILE*);
typedef void (*LPClearerr)(struct IPerlStdIO*, FILE*);
typedef int (*LPGetc)(struct IPerlStdIO*, FILE*);
-typedef char* (*LPGetBase)(struct IPerlStdIO*, FILE*);
+typedef STDCHAR* (*LPGetBase)(struct IPerlStdIO*, FILE*);
typedef int (*LPGetBufsiz)(struct IPerlStdIO*, FILE*);
typedef int (*LPGetCnt)(struct IPerlStdIO*, FILE*);
-typedef char* (*LPGetPtr)(struct IPerlStdIO*, FILE*);
+typedef STDCHAR* (*LPGetPtr)(struct IPerlStdIO*, FILE*);
typedef char* (*LPGets)(struct IPerlStdIO*, FILE*, char*, int);
typedef int (*LPPutc)(struct IPerlStdIO*, FILE*, int);
typedef int (*LPPuts)(struct IPerlStdIO*, FILE*, const char*);
@@ -94,9 +94,9 @@
typedef void (*LPSetCnt)(struct IPerlStdIO*, FILE*, int);
#ifndef NETWARE
-typedef void (*LPSetPtr)(struct IPerlStdIO*, FILE*, char*);
+typedef void (*LPSetPtr)(struct IPerlStdIO*, FILE*, STDCHAR*);
#elif defined(NETWARE)
-typedef void (*LPSetPtr)(struct IPerlStdIO*, FILE*, char*, int);
+typedef void (*LPSetPtr)(struct IPerlStdIO*, FILE*, STDCHAR*, int);
#endif
typedef void (*LPSetlinebuf)(struct IPerlStdIO*, FILE*);
==== //depot/perl/perl.h#829 (text) ====
Index: perl/perl.h
--- perl/perl.h#828~33336~ 2008-02-20 01:17:37.000000000 -0800
+++ perl/perl.h 2008-02-25 09:42:38.000000000 -0800
@@ -4010,7 +4010,7 @@
#endif
#ifdef USE_PERLIO
-EXTERN_C void PerlIO_teardown();
+EXTERN_C void PerlIO_teardown(void);
# ifdef USE_ITHREADS
# define PERLIO_INIT MUTEX_INIT(&PL_perlio_mutex)
# define PERLIO_TERM \
==== //depot/perl/perlio.c#381 (text) ====
Index: perl/perlio.c
--- perl/perlio.c#380~33296~ 2008-02-13 02:03:43.000000000 -0800
+++ perl/perlio.c 2008-02-25 09:42:38.000000000 -0800
@@ -2424,7 +2424,7 @@
}
}
-void PerlIO_teardown() /* Call only from PERL_SYS_TERM(). */
+void PerlIO_teardown(void) /* Call only from PERL_SYS_TERM(). */
{
dVAR;
#if 0
==== //depot/perl/perliol.h#47 (text) ====
Index: perl/perliol.h
--- perl/perliol.h#46~32793~ 2008-01-01 09:18:13.000000000 -0800
+++ perl/perliol.h 2008-02-25 09:42:38.000000000 -0800
@@ -170,7 +170,7 @@
/* PerlIO_teardown doesn't need exporting, but the EXTERN_C is needed
* for compiling as C++. Must also match with what perl.h says. */
-EXTERN_C void PerlIO_teardown();
+EXTERN_C void PerlIO_teardown(void);
/*--------------------------------------------------------------------------------------*/
/* Generic, or stub layer functions */
==== //depot/perl/perly.c#114 (text) ====
Index: perl/perly.c
--- perl/perly.c#113~31615~ 2007-07-16 06:15:37.000000000 -0700
+++ perl/perly.c 2008-02-25 09:42:38.000000000 -0800
@@ -193,7 +193,7 @@
S_clear_yystack(pTHX_ const yy_parser *parser)
{
yy_stack_frame *ps = parser->ps;
- int i;
+ int i = 0;
if (!parser->stack || ps == parser->stack)
return;
==== //depot/perl/regcomp.c#652 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c#651~33325~ 2008-02-17 08:53:27.000000000 -0800
+++ perl/regcomp.c 2008-02-25 09:42:38.000000000 -0800
@@ -4417,7 +4417,10 @@
Zero(r->substrs, 1, struct reg_substr_data);
#ifdef TRIE_STUDY_OPT
- if ( restudied ) {
+ if (!restudied) {
+ StructCopy(&zero_scan_data, &data, scan_data_t);
+ copyRExC_state = RExC_state;
+ } else {
U32 seen=RExC_seen;
DEBUG_OPTIMISE_r(PerlIO_printf(Perl_debug_log,"Restudying\n"));
@@ -4432,9 +4435,6 @@
SvREFCNT_dec(data.last_found);
}
StructCopy(&zero_scan_data, &data, scan_data_t);
- } else {
- StructCopy(&zero_scan_data, &data, scan_data_t);
- copyRExC_state = RExC_state;
}
#else
StructCopy(&zero_scan_data, &data, scan_data_t);
==== //depot/perl/win32/perlhost.h#73 (text) ====
Index: perl/win32/perlhost.h
--- perl/win32/perlhost.h#72~33269~ 2008-02-10 02:21:04.000000000 -0800
+++ perl/win32/perlhost.h 2008-02-25 09:42:38.000000000 -0800
@@ -616,7 +616,7 @@
return win32_getc(pf);
}
-char*
+STDCHAR*
PerlStdIOGetBase(struct IPerlStdIO* piPerl, FILE* pf)
{
#ifdef FILE_base
@@ -649,7 +649,7 @@
#endif
}
-char*
+STDCHAR*
PerlStdIOGetPtr(struct IPerlStdIO* piPerl, FILE* pf)
{
#ifdef USE_STDIO_PTR
@@ -742,7 +742,7 @@
}
void
-PerlStdIOSetPtr(struct IPerlStdIO* piPerl, FILE* pf, char * ptr)
+PerlStdIOSetPtr(struct IPerlStdIO* piPerl, FILE* pf, STDCHAR * ptr)
{
#ifdef STDIO_PTR_LVALUE
FILE *f = pf;
==== //depot/perl/win32/win32.c#296 (text) ====
Index: perl/win32/win32.c
--- perl/win32/win32.c#295~33291~ 2008-02-12 05:15:20.000000000 -0800
+++ perl/win32/win32.c 2008-02-25 09:42:38.000000000 -0800
@@ -1639,7 +1639,7 @@
}
static void
-out_of_memory()
+out_of_memory(void)
{
if (PL_curinterp) {
dTHX;
@@ -2553,7 +2553,7 @@
}
DllExport FILE *
-win32_stdout()
+win32_stdout(void)
{
return (stdout);
}
@@ -2935,7 +2935,7 @@
if (GetFileInformationByHandle((HANDLE)_get_osfhandle(fd), &bhfi)) {
#if defined(WIN64) || defined(USE_LARGE_FILES)
- sbufptr->st_size = (bhfi.nFileSizeHigh << 32) + bhfi.nFileSizeLow ;
+ sbufptr->st_size = ((__int64)bhfi.nFileSizeHigh << 32) |
bhfi.nFileSizeLow ;
#endif
sbufptr->st_mode &= 0xFE00;
if (bhfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
@@ -4942,7 +4942,7 @@
}
void
-win32_create_message_window_class()
+win32_create_message_window_class(void)
{
/* create the window class for "message only" windows */
WNDCLASS wc;
@@ -4958,7 +4958,7 @@
}
HWND
-win32_create_message_window()
+win32_create_message_window(void)
{
HWND hwnd = NULL;
End of Patch.
