[prev in list] [next in list] [prev in thread] [next in thread] 

List:       perl5-changes
Subject:    Change 33593: Integrate:
From:       Nicholas Clark <nwc10+p5p4 () colon ! colondot ! net>
Date:       2008-03-28 20:00:05
Message-ID: 20080328200005.6F81F50097 () mx ! activestate ! com
[Download RAW message or body]

Change 33593 by nicholas@nicholas-plum on 2008/03/28 19:45:31

	Integrate:
	[ 33590]
	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.8/perl/NetWare/nwperlhost.h#3 integrate
... //depot/maint-5.8/perl/NetWare/nwperlsys.h#3 integrate
... //depot/maint-5.8/perl/ext/Win32/Win32.pm#5 integrate
... //depot/maint-5.8/perl/ext/Win32/Win32.xs#4 integrate
... //depot/maint-5.8/perl/iperlsys.h#9 integrate
... //depot/maint-5.8/perl/perl.h#182 integrate
... //depot/maint-5.8/perl/perlio.c#120 integrate
... //depot/maint-5.8/perl/perliol.h#11 integrate
... //depot/maint-5.8/perl/win32/perlhost.h#13 integrate
... //depot/maint-5.8/perl/win32/win32.c#52 integrate
... //depot/maint-5.8/perl/win32/win32io.c#5 integrate

Differences ...

==== //depot/maint-5.8/perl/NetWare/nwperlhost.h#3 (text) ====
Index: perl/NetWare/nwperlhost.h
--- perl/NetWare/nwperlhost.h#2~33203~	2008-02-02 10:14:24.000000000 -0800
+++ perl/NetWare/nwperlhost.h	2008-03-28 12:45:31.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.8/perl/NetWare/nwperlsys.h#3 (text) ====
Index: perl/NetWare/nwperlsys.h
--- perl/NetWare/nwperlsys.h#2~33203~	2008-02-02 10:14:24.000000000 -0800
+++ perl/NetWare/nwperlsys.h	2008-03-28 12:45:31.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.8/perl/ext/Win32/Win32.pm#5 (text) ====
Index: perl/ext/Win32/Win32.pm
--- perl/ext/Win32/Win32.pm#4~32450~	2007-11-22 09:45:52.000000000 -0800
+++ perl/ext/Win32/Win32.pm	2008-03-28 12:45:31.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.8/perl/ext/Win32/Win32.xs#4 (text) ====
Index: perl/ext/Win32/Win32.xs
--- perl/ext/Win32/Win32.xs#3~32310~	2007-11-14 09:01:40.000000000 -0800
+++ perl/ext/Win32/Win32.xs	2008-03-28 12:45:31.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.8/perl/iperlsys.h#9 (text) ====
Index: perl/iperlsys.h
--- perl/iperlsys.h#8~33454~	2008-03-08 15:09:00.000000000 -0800
+++ perl/iperlsys.h	2008-03-28 12:45:31.000000000 -0700
@@ -69,10 +69,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*);
@@ -90,9 +90,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.8/perl/perl.h#182 (text) ====
Index: perl/perl.h
--- perl/perl.h#181~33474~	2008-03-11 09:58:39.000000000 -0700
+++ perl/perl.h	2008-03-28 12:45:31.000000000 -0700
@@ -3838,7 +3838,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.8/perl/perlio.c#120 (text) ====
Index: perl/perlio.c
--- perl/perlio.c#119~33530~	2008-03-14 05:06:34.000000000 -0700
+++ perl/perlio.c	2008-03-28 12:45:31.000000000 -0700
@@ -2409,7 +2409,7 @@
     }
 }
 
-void PerlIO_teardown() /* Call only from PERL_SYS_TERM(). */
+void PerlIO_teardown(void) /* Call only from PERL_SYS_TERM(). */
 {
     
 #if 0

==== //depot/maint-5.8/perl/perliol.h#11 (text) ====
Index: perl/perliol.h
--- perl/perliol.h#10~33204~	2008-02-02 10:16:39.000000000 -0800
+++ perl/perliol.h	2008-03-28 12:45:31.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.8/perl/win32/perlhost.h#13 (text) ====
Index: perl/win32/perlhost.h
--- perl/win32/perlhost.h#12~33203~	2008-02-02 10:14:24.000000000 -0800
+++ perl/win32/perlhost.h	2008-03-28 12:45:31.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.8/perl/win32/win32.c#52 (text) ====
Index: perl/win32/win32.c
--- perl/win32/win32.c#51~33576~	2008-03-26 09:58:17.000000000 -0700
+++ perl/win32/win32.c	2008-03-28 12:45:31.000000000 -0700
@@ -1618,7 +1618,7 @@
 }
 
 static void
-out_of_memory()
+out_of_memory(void)
 {
     if (PL_curinterp) {
         dTHX;
@@ -2537,7 +2537,7 @@
 }
 
 DllExport FILE *
-win32_stdout()
+win32_stdout(void)
 {
     return (stdout);
 }
@@ -2919,7 +2919,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)

==== //depot/maint-5.8/perl/win32/win32io.c#5 (text) ====
Index: perl/win32/win32io.c
--- perl/win32/win32io.c#4~30140~	2007-02-05 14:01:07.000000000 -0800
+++ perl/win32/win32io.c	2008-03-28 12:45:31.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.
[prev in list] [next in list] [prev in thread] [next in thread]