In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/1d5f8e8e6ae4cf57194522cabded39fe7371c9da?hp=d25148c1bd1f4c26569fbfdf34270fa3f8f9d6a3>

- Log -----------------------------------------------------------------
commit 1d5f8e8e6ae4cf57194522cabded39fe7371c9da
Author: Steve Hay <[email protected]>
Date:   Tue Feb 10 08:51:26 2015 +0000

    Remove duplicate declaration of win32_stat from win32/win32iop.h
    
    The same declaration appears slightly higher up in the same file.

M       win32/win32iop.h

commit 0bcc29e72bad67486863beeedf2d515e2be3665d
Author: Steve Hay <[email protected]>
Date:   Tue Feb 10 08:23:22 2015 +0000

    Silence compiler warnings with gcc 4.7.2 and 4.8.1 from www.mingw.org
    
    These compilers (with other contemporaneous packages, I forget exactly
    which versions of everything I have installed) contain
    
    #define fstat _fstat
    
    in include/sys/stat.h, which clashes with win32/win32iop.h's #define and
    causes "warning: "fstat" redefined [enabled by default]" for just about
    every .c file compiled. Likewise for stat.

M       win32/win32iop.h
-----------------------------------------------------------------------

Summary of changes:
 win32/win32iop.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/win32/win32iop.h b/win32/win32iop.h
index 246375f..842bc07 100644
--- a/win32/win32iop.h
+++ b/win32/win32iop.h
@@ -130,7 +130,6 @@ DllExport  int              win32_putenv(const char *name);
 DllExport  unsigned    win32_sleep(unsigned int);
 DllExport  int         win32_times(struct tms *timebuf);
 DllExport  unsigned    win32_alarm(unsigned int sec);
-DllExport  int         win32_stat(const char *path, Stat_t *buf);
 DllExport  char*       win32_longpath(char *path);
 DllExport  char*       win32_ansipath(const WCHAR *path);
 DllExport  int         win32_ioctl(int i, unsigned int u, char *data);
@@ -289,11 +288,11 @@ END_EXTERN_C
 #  undef abort
 #endif
 #define abort()                        win32_abort()
-#ifdef UNDER_CE
+#if defined(UNDER_CE) || defined(__MINGW32__)
 #  undef fstat
 #endif
 #define fstat(fd,bufptr)       win32_fstat(fd,bufptr)
-#ifdef UNDER_CE
+#if defined(UNDER_CE) || defined(__MINGW32__)
 #  undef stat
 #endif
 #define stat(pth,bufptr)       win32_stat(pth,bufptr)

--
Perl5 Master Repository

Reply via email to