Resolve [#2085], [#2086] and [#2087].

diff --git a/ChangeLog b/ChangeLog
index ca6c759..482c485 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 RELEASE 4.1:
 
+2013-10-06  Earnie Boyd  <earnie@users.sourceforge.net>
+       
+       * include/oaidl.h: Include objidl.h.
+       Move the RPC headers before the file protection.
+       [#2085] oaidl.h needs objidl.h for IUknown structure.
+
+       * include/objidl.h: Include unknwn.h.
+       [#2086] objidl.h should include unknwn.h.
+
+       * include/unknwn.h: Move the RPC headers before the file protection.
+       [#2087] unknwn.h needs to include RPC headers before file filter.
+
 2013-10-02  Earnie Boyd  <earnie@users.sourceforge.net>
 
        [#2081] Neeed a __FORCEINLINE macro for better definition.

diff --git a/include/oaidl.h b/include/oaidl.h
index 9e8ea99..6e220ad 100644 (file)
--- a/include/oaidl.h
+++ b/include/oaidl.h
@@ -21,16 +21,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _OAIDL_H
-#define _OAIDL_H
-#pragma GCC system_header
-#include <_mingw.h>
+#include <rpc.h>
+#include <rpcndr.h>
 
 #ifndef COM_NO_WINDOWS_H
 #include <windows.h>
 #include <ole2.h>
 #endif
 
+#ifndef _OAIDL_H
+#define _OAIDL_H
+#pragma GCC system_header
+#include <_mingw.h>
+
+#include <objidl.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/include/objidl.h b/include/objidl.h
index 86d6087..3b3a414 100644 (file)
--- a/include/objidl.h
+++ b/include/objidl.h
@@ -27,6 +27,7 @@
 #include <_mingw.h>
 
 #include <objfwd.h>
+#include <unknwn.h>
 
 #define PIDSI_TITLE            0x00000002
 #define PIDSI_SUBJECT          0x00000003

diff --git a/include/unknwn.h b/include/unknwn.h
index 16a3546..ffc5138 100644 (file)
--- a/include/unknwn.h
+++ b/include/unknwn.h
@@ -21,11 +21,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _UNKNWN_H
-#define _UNKNWN_H
-#pragma GCC system_header
-#include <_mingw.h>
-
 #include <rpc.h>
 #include <rpcndr.h>
 
@@ -34,6 +29,11 @@
 #include <ole2.h>
 #endif
 
+#ifndef _UNKNWN_H
+#define _UNKNWN_H
+#pragma GCC system_header
+#include <_mingw.h>
+
 #ifdef __cplusplus
 extern "C"{
 #endif