emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r107091: Avoid MS-Windows compilation


From: Eli Zaretskii
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r107091: Avoid MS-Windows compilation errors when struct stat is redefined.
Date: Sat, 04 Feb 2012 15:24:07 +0200
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 107091
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-04 15:24:07 +0200
message:
  Avoid MS-Windows compilation errors when struct stat is redefined.
  
   nt/inc/sys/stat.h (_STAT_DEFINED): Define, to prevent redefinitions
   by other headers.
modified:
  nt/ChangeLog
  nt/inc/sys/stat.h
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-01-31 16:15:03 +0000
+++ b/nt/ChangeLog      2012-02-04 13:24:07 +0000
@@ -1,3 +1,8 @@
+2012-02-04  Eli Zaretskii  <address@hidden>
+
+       * inc/sys/stat.h (_STAT_DEFINED): Define, to prevent redefinitions
+       by other headers.
+
 2011-11-27  Fabrice Popineau  <address@hidden>  (tiny change)
 
        * inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs.

=== modified file 'nt/inc/sys/stat.h'
--- a/nt/inc/sys/stat.h 2012-01-19 07:21:25 +0000
+++ b/nt/inc/sys/stat.h 2012-02-04 13:24:07 +0000
@@ -97,6 +97,9 @@
   char            st_gname[260];
 };
 
+/* Prevent redefinition by other headers, e.g. wchar.h.  */
+#define _STAT_DEFINED
+
 _CRTIMP int __cdecl __MINGW_NOTHROW    fstat (int, struct stat*);
 _CRTIMP int __cdecl __MINGW_NOTHROW    chmod (const char*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW    stat (const char*, struct stat*);


reply via email to

[Prev in Thread] Current Thread [Next in Thread]