* src/macfont.m (mac_font_shape): Make sure that total_advance is increasing.

[gnu-emacs] / src / w32common.h

diff --git a/src/w32common.h b/src/w32common.h
index 50724e5553ce9c67d222067c2aef1772aed2f3c5..f30c0cedae4cf03076d062bda3e72ebe9fc39853 100644 (file)
--- a/src/w32common.h
+++ b/src/w32common.h
@@ -1,12 +1,12 @@
 /* Common functions for Microsoft Windows builds of Emacs
-   Copyright (C) 2012 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-   
+
 */
 
 #ifndef W32COMMON_H
@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 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;