[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110917: More fixes for bug #12878 with MS-Windows MSVC build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110917
fixes bug: http://debbugs.gnu.org/12878
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-19 19:34:21 +0200
message:
  More fixes for bug #12878 with MS-Windows MSVC build.
  
   src/xdisp.c (start_hourglass) [HAVE_NTGUI]: Don't mix declaration of
   w32_note_current_window with code.  (Backport from trunk.)
   src/w32.c (FILE_DEVICE_FILE_SYSTEM, METHOD_BUFFERED)
   (FILE_ANY_ACCESS, CTL_CODE, FSCTL_GET_REPARSE_POINT) [_MSC_VER]:
   Define for the MSVC compiler.
   src/w32term.h (EnumSystemLocalesW) [_MSC_VER]: Add a missing
   semi-colon.
  
   nt/inc/stdint.h (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
modified:
  nt/ChangeLog
  nt/inc/stdint.h
  src/ChangeLog
  src/w32.c
  src/w32term.h
  src/xdisp.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-11-01 14:21:45 +0000
+++ b/nt/ChangeLog      2012-11-19 17:34:21 +0000
@@ -1,3 +1,7 @@
+2012-11-19  Eli Zaretskii  <address@hidden>
+
+       * inc/stdint.h (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
+
 2012-11-01  Eli Zaretskii  <address@hidden>
 
        * inc/unistd.h (setpgid, getpgrp): Provide prototypes.  (Bug#12776)

=== modified file 'nt/inc/stdint.h'
--- a/nt/inc/stdint.h   2012-01-05 09:46:05 +0000
+++ b/nt/inc/stdint.h   2012-11-19 17:34:21 +0000
@@ -60,6 +60,7 @@
 #endif
 
 #define PTRDIFF_MAX INTPTR_MAX
+#define PTRDIFF_MIN INTPTR_MIN
 
 #endif /* !__GNUC__ */
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-18 16:43:36 +0000
+++ b/src/ChangeLog     2012-11-19 17:34:21 +0000
@@ -1,3 +1,15 @@
+2012-11-19  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (start_hourglass) [HAVE_NTGUI]: Don't mix declaration of
+       w32_note_current_window with code.  (Backport from trunk.)
+
+       * w32.c (FILE_DEVICE_FILE_SYSTEM, METHOD_BUFFERED)
+       (FILE_ANY_ACCESS, CTL_CODE, FSCTL_GET_REPARSE_POINT) [_MSC_VER]:
+       Define for the MSVC compiler.
+
+       * w32term.h (EnumSystemLocalesW) [_MSC_VER]: Add a missing
+       semi-colon.
+
 2012-11-18  Eli Zaretskii  <address@hidden>
 
        * fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)

=== modified file 'src/w32.c'
--- a/src/w32.c 2012-10-19 19:25:18 +0000
+++ b/src/w32.c 2012-11-19 17:34:21 +0000
@@ -119,9 +119,10 @@
 #include <aclapi.h>
 
 #ifdef _MSC_VER
-/* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER, except
-   on ntifs.h, which cannot be included because it triggers conflicts
-   with other Windows API headers.  So we define it here by hand.  */
+/* MSVC doesn't provide the definition of REPARSE_DATA_BUFFER and the
+   associated macros, except on ntifs.h, which cannot be included
+   because it triggers conflicts with other Windows API headers.  So
+   we define it here by hand.  */
 
 typedef struct _REPARSE_DATA_BUFFER {
     ULONG  ReparseTag;
@@ -149,6 +150,12 @@
     } DUMMYUNIONNAME;
 } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
 
+#define FILE_DEVICE_FILE_SYSTEM        9
+#define METHOD_BUFFERED                0
+#define FILE_ANY_ACCESS                0x00000000
+#define CTL_CODE(t,f,m,a)       (((t)<<16)|((a)<<14)|((f)<<2)|(m))
+#define FSCTL_GET_REPARSE_POINT \
+  CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #endif
 
 /* TCP connection support.  */

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2012-11-17 18:51:06 +0000
+++ b/src/w32term.h     2012-11-19 17:34:21 +0000
@@ -758,7 +758,7 @@
 typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR);
 typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR);
 BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD);
-BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD)
+BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD);
 #ifdef UNICODE
 #define EnumSystemLocales EnumSystemLocalesW
 #else

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-11-12 15:25:34 +0000
+++ b/src/xdisp.c       2012-11-19 17:34:21 +0000
@@ -29433,8 +29433,10 @@
     delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0);
 
 #ifdef HAVE_NTGUI
-  extern void w32_note_current_window (void);
-  w32_note_current_window ();
+  {
+    extern void w32_note_current_window (void);
+    w32_note_current_window ();
+  }
 #endif /* HAVE_NTGUI */
 
   hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,