Make <winuser.h> header effectively self-contained.

diff --git a/w32api/ChangeLog b/w32api/ChangeLog
index dac6a9f..b682fc6 100644 (file)
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2017-06-06  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Make <winuser.h> header effectively self-contained.
+
+       * include/winuser.h (stdarg.h): Include it, in addition to...
+       [NOGDI] (windef.h): ...this, directly or otherwise indirectly via...
+       [!NOGDI] (wingdi.h): ...this, for effective self-containment.
+
 2017-06-04  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Consolidate <wingdi.h> version specific conditionals.

diff --git a/w32api/include/winuser.h b/w32api/include/winuser.h
index c6714a1..bfb1f9d 100644 (file)
--- a/w32api/include/winuser.h
+++ b/w32api/include/winuser.h
@@ -7,7 +7,7 @@
  * $Id$
  *
  * Written by Anders Norlander <anorland@hem2.passagen.se>
- * Copyright (C) 1998-2012, 2016, MinGW.org Project
+ * Copyright (C) 1998-2012, 2016, 2017, MinGW.org Project
  *
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -39,6 +39,17 @@
  */
 #define __WINUSER_H_SOURCED__
 
+/* To make <winuser.h> effectively self-contained, we require definitions
+ * from <windef.h>, possibly <wingdi.h>, (which also requires <windef.h>),
+ * and <stdarg.h>
+ */
+#ifdef NOGDI
+#include <windef.h>
+#else
+#include <wingdi.h>
+#endif
+#include <stdarg.h>
+
 _BEGIN_C_DECLS
 
 #ifndef WINUSERAPI