X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0c382083b6b550c26fad8ac7f59b1ba09663e728..87c6b4e6bd7e023bd57c709bb6af59bca27bf4f6:/src/w32gui.h
diff --git a/src/w32gui.h b/src/w32gui.h
index 9cad4f21f2..0da8de97f2 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,6 +1,5 @@
-/* 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.
+/* Definitions and headers for communication on the Microsoft Windows API.
+ Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -21,6 +20,8 @@ along with GNU Emacs. If not, see . */
#define EMACS_W32GUI_H
#include
+#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)))
@@ -48,7 +49,6 @@ typedef char * XrmDatabase;
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;
@@ -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) \
- ((*chp) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
+ ((*(chp)) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
#define XCHAR2B_BYTE1(chp) \
- (((*chp) & 0xff00) >> 8)
+ (((*(chp)) & 0xff00) >> 8)
#define XCHAR2B_BYTE2(chp) \
- ((*chp) & 0x00ff)
+ ((*(chp)) & 0x00ff)
/* Windows equivalent of XImage. */
@@ -118,9 +118,6 @@ extern int nCmdShow;
#define PBaseSize (1L << 8) /* program specified base for incrementing */
#define PWinGravity (1L << 9) /* program specified window gravity */
-extern int XParseGeometry (char *, int *, int *, unsigned *, unsigned *);
-
-
typedef struct {
int x, y;
unsigned width, height;
@@ -148,6 +145,3 @@ typedef struct {
#endif /* EMACS_W32GUI_H */
-
-/* arch-tag: 9172e5fb-45a5-4684-afd9-ca0e81324604
- (do not change this comment) */