Change 33590 by [EMAIL PROTECTED] on 2008/03/28 19:01:33
Integrate:
[ 33344]
Silence warning from VC8 when building without USE_LARGE_FILES
[ 33370]
Silence Borland compiler warnings (except for warnings from zlib) here:
http://www.nntp.perl.org/group/perl.daily-build.reports/2008/02/msg53937.html
[except for Time::Piece, as it's not in a CPAN release yet]
Affected files ...
... //depot/maint-5.10/perl/NetWare/nwperlhost.h#3 integrate
... //depot/maint-5.10/perl/NetWare/nwperlsys.h#3 integrate
... //depot/maint-5.10/perl/ext/Win32/Win32.pm#2 integrate
... //depot/maint-5.10/perl/ext/Win32/Win32.xs#2 integrate
... //depot/maint-5.10/perl/generate_uudmap.c#2 integrate
... //depot/maint-5.10/perl/iperlsys.h#3 integrate
... //depot/maint-5.10/perl/perl.h#8 integrate
... //depot/maint-5.10/perl/perlio.c#4 integrate
... //depot/maint-5.10/perl/perliol.h#3 integrate
... //depot/maint-5.10/perl/perly.c#2 integrate
... //depot/maint-5.10/perl/regcomp.c#9 integrate
... //depot/maint-5.10/perl/win32/perlhost.h#3 integrate
... //depot/maint-5.10/perl/win32/win32.c#5 integrate
... //depot/maint-5.10/perl/win32/win32io.c#2 integrate
Differences ...
==== //depot/maint-5.10/perl/NetWare/nwperlhost.h#3 (text) ====
Index: perl/NetWare/nwperlhost.h
--- perl/NetWare/nwperlhost.h#2~33121~ 2008-01-30 03:03:49.000000000 -0800
+++ perl/NetWare/nwperlhost.h 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/NetWare/nwperlsys.h#3 (text) ====
Index: perl/NetWare/nwperlsys.h
--- perl/NetWare/nwperlsys.h#2~33121~ 2008-01-30 03:03:49.000000000 -0800
+++ perl/NetWare/nwperlsys.h 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/ext/Win32/Win32.pm#2 (text) ====
Index: perl/ext/Win32/Win32.pm
--- perl/ext/Win32/Win32.pm#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/Win32/Win32.pm 2008-03-28 12:01:33.000000000 -0700
@@ -8,7 +8,7 @@
require DynaLoader;
@ISA = qw|Exporter DynaLoader|;
- $VERSION = '0.34';
+ $VERSION = '0.34_01';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
==== //depot/maint-5.10/perl/ext/Win32/Win32.xs#2 (text) ====
Index: perl/ext/Win32/Win32.xs
--- perl/ext/Win32/Win32.xs#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/Win32/Win32.xs 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/generate_uudmap.c#2 (text) ====
Index: perl/generate_uudmap.c
--- perl/generate_uudmap.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/generate_uudmap.c 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/iperlsys.h#3 (text) ====
Index: perl/iperlsys.h
--- perl/iperlsys.h#2~33123~ 2008-01-30 03:45:08.000000000 -0800
+++ perl/iperlsys.h 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/perl.h#8 (text) ====
Index: perl/perl.h
--- perl/perl.h#7~33166~ 2008-02-01 04:52:40.000000000 -0800
+++ perl/perl.h 2008-03-28 12:01:33.000000000 -0700
@@ -3989,7 +3989,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/maint-5.10/perl/perlio.c#4 (text) ====
Index: perl/perlio.c
--- perl/perlio.c#3~33529~ 2008-03-14 04:50:59.000000000 -0700
+++ perl/perlio.c 2008-03-28 12:01:33.000000000 -0700
@@ -2413,7 +2413,7 @@
}
}
-void PerlIO_teardown() /* Call only from PERL_SYS_TERM(). */
+void PerlIO_teardown(void) /* Call only from PERL_SYS_TERM(). */
{
dVAR;
#if 0
==== //depot/maint-5.10/perl/perliol.h#3 (text) ====
Index: perl/perliol.h
--- perl/perliol.h#2~33123~ 2008-01-30 03:45:08.000000000 -0800
+++ perl/perliol.h 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/perly.c#2 (text) ====
Index: perl/perly.c
--- perl/perly.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/perly.c 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/regcomp.c#9 (text) ====
Index: perl/regcomp.c
--- perl/regcomp.c#8~33150~ 2008-01-31 04:04:14.000000000 -0800
+++ perl/regcomp.c 2008-03-28 12:01:33.000000000 -0700
@@ -4377,7 +4377,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"));
@@ -4392,9 +4395,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/maint-5.10/perl/win32/perlhost.h#3 (text) ====
Index: perl/win32/perlhost.h
--- perl/win32/perlhost.h#2~33121~ 2008-01-30 03:03:49.000000000 -0800
+++ perl/win32/perlhost.h 2008-03-28 12:01:33.000000000 -0700
@@ -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/maint-5.10/perl/win32/win32.c#5 (text) ====
Index: perl/win32/win32.c
--- perl/win32/win32.c#4~33588~ 2008-03-28 10:57:44.000000000 -0700
+++ perl/win32/win32.c 2008-03-28 12:01:33.000000000 -0700
@@ -1644,7 +1644,7 @@
}
static void
-out_of_memory()
+out_of_memory(void)
{
if (PL_curinterp) {
dTHX;
@@ -2557,7 +2557,7 @@
}
DllExport FILE *
-win32_stdout()
+win32_stdout(void)
{
return (stdout);
}
@@ -2939,7 +2939,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)
@@ -4946,7 +4946,7 @@
}
void
-win32_create_message_window_class()
+win32_create_message_window_class(void)
{
/* create the window class for "message only" windows */
WNDCLASS wc;
@@ -4962,7 +4962,7 @@
}
HWND
-win32_create_message_window()
+win32_create_message_window(void)
{
HWND hwnd = NULL;
==== //depot/maint-5.10/perl/win32/win32io.c#2 (text) ====
Index: perl/win32/win32io.c
--- perl/win32/win32io.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/win32/win32io.c 2008-03-28 12:01:33.000000000 -0700
@@ -256,7 +256,11 @@
{
static const DWORD where[3] = { FILE_BEGIN, FILE_CURRENT, FILE_END };
PerlIOWin32 *s = PerlIOSelf(f,PerlIOWin32);
- DWORD high = (sizeof(offset) > sizeof(DWORD)) ? (DWORD)(offset >> 32) : 0;
+#if Off_t_size >= 8
+ DWORD high = (DWORD)(offset >> 32);
+#else
+ DWORD high = 0;
+#endif
DWORD low = (DWORD) offset;
DWORD res = SetFilePointer(s->h,(LONG)low,(LONG *)&high,where[whence]);
if (res != 0xFFFFFFFF || GetLastError() != NO_ERROR)
@@ -277,7 +281,11 @@
DWORD res = SetFilePointer(s->h,0,(LONG *)&high,FILE_CURRENT);
if (res != 0xFFFFFFFF || GetLastError() != NO_ERROR)
{
+#if Off_t_size >= 8
return ((Off_t) high << 32) | res;
+#else
+ return res;
+#endif
}
return (Off_t) -1;
}
End of Patch.
