From fda7100c9d34a2c5dccddfd25e87193abe55a152 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 16 Aug 2001 00:44:40 +0000
Subject: updated

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1545 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 loader/com.h | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/loader/com.h b/loader/com.h
index bff7722ffc..a902632549 100644
--- a/loader/com.h
+++ b/loader/com.h
@@ -1,9 +1,13 @@
+#ifndef AVIFILE_COM_H
+#define AVIFILE_COM_H
+
+#include <inttypes.h>
+
 /**
  * Internal functions and structures for COM emulation code.
  */
 
-#ifndef COM_H
-#define COM_H
+#ifndef WIN32
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,22 +16,26 @@ extern "C" {
 void* CoTaskMemAlloc(unsigned long cb);
 void CoTaskMemFree(void* cb);
 
+#ifndef GUID_TYPE
+#define GUID_TYPE
 typedef struct
 {
-    long f1;
-    short f2;
-    short f3;
-    char f4[8];
+    uint32_t f1;
+    uint16_t f2;
+    uint16_t f3;
+    uint8_t  f4[8];
 } GUID;
+#endif
 
 extern GUID IID_IUnknown;
 extern GUID IID_IClassFactory;
 
 typedef long (*GETCLASSOBJECT) (GUID* clsid, GUID* iid, void** ppv);
 int RegisterComClass(GUID* clsid, GETCLASSOBJECT gcs);
+int UnregisterComClass(GUID* clsid, GETCLASSOBJECT gcs);
 
 #ifndef STDCALL
-#define STDCALL __attribute__((__stdcall__))	
+#define STDCALL __attribute__((__stdcall__))
 #endif
 
 struct IUnknown;
@@ -57,11 +65,12 @@ struct IClassFactory
 };
 
 long CoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter,
-                    long dwClsContext, GUID* riid, void** ppv);
+		      long dwClsContext, GUID* riid, void** ppv);
 
 #ifdef __cplusplus
 };
-#endif
+#endif /* __cplusplus */
 
-#endif
+#endif /* WIN32 */
 
+#endif /* AVIFILE_COM_H */
-- 
cgit v1.2.3