HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make 'configure' a bit smaller and faster.
[bpt/emacs.git]
/
src
/
w32gui.h
diff --git
a/src/w32gui.h
b/src/w32gui.h
index
9cad4f2
..
1e800e3
100644
(file)
--- a/
src/w32gui.h
+++ b/
src/w32gui.h
@@
-1,6
+1,5
@@
/* Definitions and headers for communication on the Microsoft W32 API.
/* Definitions and headers for communication on the Microsoft W32 API.
- Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-21,6
+20,8
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define EMACS_W32GUI_H
#include <windows.h>
#define EMACS_W32GUI_H
#include <windows.h>
+#include "systime.h" /* for Time */
+
/* Local memory management for menus. */
#define local_heap (GetProcessHeap ())
#define local_alloc(n) (HeapAlloc (local_heap, HEAP_ZERO_MEMORY, (n)))
/* Local memory management for menus. */
#define local_heap (GetProcessHeap ())
#define local_alloc(n) (HeapAlloc (local_heap, HEAP_ZERO_MEMORY, (n)))
@@
-48,7
+49,6
@@
typedef char * XrmDatabase;
typedef XGCValues * GC;
typedef COLORREF Color;
typedef XGCValues * GC;
typedef COLORREF Color;
-typedef DWORD Time;
typedef HWND Window;
typedef HDC Display; /* HDC so it doesn't conflict with xpm lib. */
typedef HCURSOR Cursor;
typedef HWND Window;
typedef HDC Display; /* HDC so it doesn't conflict with xpm lib. */
typedef HCURSOR Cursor;
@@
-59,13
+59,13
@@
typedef HCURSOR Cursor;
/* Dealing with bits of wchar_t as if they were an XChar2b. */
#define STORE_XCHAR2B(chp, byte1, byte2) \
/* Dealing with bits of wchar_t as if they were an XChar2b. */
#define STORE_XCHAR2B(chp, byte1, byte2) \
- ((*
chp
) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
+ ((*
(chp)
) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
#define XCHAR2B_BYTE1(chp) \
#define XCHAR2B_BYTE1(chp) \
-
(((*chp
) & 0xff00) >> 8)
+
(((*(chp)
) & 0xff00) >> 8)
#define XCHAR2B_BYTE2(chp) \
#define XCHAR2B_BYTE2(chp) \
-
((*chp
) & 0x00ff)
+
((*(chp)
) & 0x00ff)
/* Windows equivalent of XImage. */
/* Windows equivalent of XImage. */
@@
-148,6
+148,3
@@
typedef struct {
#endif /* EMACS_W32GUI_H */
#endif /* EMACS_W32GUI_H */
-
-/* arch-tag: 9172e5fb-45a5-4684-afd9-ca0e81324604
- (do not change this comment) */