[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110974: Fix compilation problems with 64-bit MSVC compiler.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110974
author: Fabrice Popineau <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-11-30 17:14:22 +0200
message:
  Fix compilation problems with 64-bit MSVC compiler.
  
   src/w32fns.c: Remove prototype of atof.
   (syspage_mask): Declared DWORD_PTR, for compatibility with 64-bit
   builds.
   (file_dialog_callback): Declared UINT_PTR.
   src/w32common.h (syspage_mask): Declare DWORD_PTR, for compatibility
   with 64-bit builds.
   src/w32.c (FILE_DEVICE_FILE_SYSTEM, METHOD_BUFFERED)
   (FILE_ANY_ACCESS, CTL_CODE) [_MSC_VER]: Define only if not already
   defined.
modified:
  src/ChangeLog
  src/w32.c
  src/w32common.h
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-27 20:45:30 +0000
+++ b/src/ChangeLog     2012-11-30 15:14:22 +0000
@@ -1,3 +1,17 @@
+2012-11-30  Fabrice Popineau  <address@hidden>
+
+       * w32fns.c: Remove prototype of atof.
+       (syspage_mask): Declared DWORD_PTR, for compatibility with 64-bit
+       builds.
+       (file_dialog_callback): Declared UINT_PTR.
+
+       * w32common.h (syspage_mask): Declare DWORD_PTR, for compatibility
+       with 64-bit builds.
+
+       * w32.c (FILE_DEVICE_FILE_SYSTEM, METHOD_BUFFERED)
+       (FILE_ANY_ACCESS, CTL_CODE) [_MSC_VER]: Define only if not already
+       defined.
+
 2012-11-27  Glenn Morris  <address@hidden>
 
        * data.c (Fboundp, Fsymbol_value): Doc fix re lexical-binding.

=== modified file 'src/w32.c'
--- a/src/w32.c 2012-11-19 17:34:21 +0000
+++ b/src/w32.c 2012-11-30 15:14:22 +0000
@@ -150,10 +150,18 @@
     } DUMMYUNIONNAME;
 } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
 
+#ifndef FILE_DEVICE_FILE_SYSTEM
 #define FILE_DEVICE_FILE_SYSTEM        9
+#endif
+#ifndef METHOD_BUFFERED
 #define METHOD_BUFFERED                0
+#endif
+#ifndef FILE_ANY_ACCESS
 #define FILE_ANY_ACCESS                0x00000000
+#endif
+#ifndef CTL_CODE
 #define CTL_CODE(t,f,m,a)       (((t)<<16)|((a)<<14)|((f)<<2)|(m))
+#endif
 #define FSCTL_GET_REPARSE_POINT \
   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #endif

=== modified file 'src/w32common.h'
--- a/src/w32common.h   2012-10-08 12:53:18 +0000
+++ b/src/w32common.h   2012-11-30 15:14:22 +0000
@@ -34,7 +34,7 @@
 
 extern SYSTEM_INFO    sysinfo_cache;
 extern OSVERSIONINFO  osinfo_cache;
-extern unsigned long  syspage_mask;
+extern DWORD_PTR      syspage_mask;
 
 extern int           w32_major_version;
 extern int           w32_minor_version;

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-11-20 19:28:53 +0000
+++ b/src/w32fns.c      2012-11-30 15:14:22 +0000
@@ -80,7 +80,6 @@
 void globals_of_w32fns (void);
 
 extern void free_frame_menubar (struct frame *);
-extern double atof (const char *);
 extern int w32_console_toggle_lock_key (int, Lisp_Object);
 extern void w32_menu_display_help (HWND, HMENU, UINT, UINT);
 extern void w32_free_menu_strings (HWND);
@@ -221,7 +220,7 @@
 /* This gives us version, build, and platform identification.  */
 OSVERSIONINFO osinfo_cache;
 
-unsigned long syspage_mask = 0;
+DWORD_PTR syspage_mask = 0;
 
 /* The major and minor versions of NT.  */
 int w32_major_version;
@@ -6019,7 +6018,7 @@
    read-only when "Directories" is selected in the filter.  This
    allows us to work around the fact that the standard Open File
    dialog does not support directories.  */
-static UINT CALLBACK
+static UINT_PTR CALLBACK
 file_dialog_callback (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   if (msg == WM_NOTIFY)