X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640..b59a2e9edb562fce9c63a73242db323cd4a9dc0f:/src/w32gui.h
diff --git a/src/w32gui.h b/src/w32gui.h
index 936709af18..739ff3c92e 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,5 +1,5 @@
-/* Definitions and headers for communication on the Microsoft W32 API.
- Copyright (C) 1995, 2001-2011 Free Software Foundation, Inc.
+/* Definitions and headers for communication on the Microsoft Windows API.
+ Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -20,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)))
@@ -47,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;
@@ -78,9 +79,6 @@ typedef struct _XImage
#define FACE_DEFAULT (~0)
extern HINSTANCE hinst;
-extern HINSTANCE hprevinst;
-extern LPSTR lpCmdLine;
-extern int nCmdShow;
/* Bit Gravity */
@@ -117,9 +115,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;
@@ -147,4 +142,3 @@ typedef struct {
#endif /* EMACS_W32GUI_H */
-