X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=include%2Fc%2B%2B%2Forb.h;h=72daad843dcedaaed5ab6175e8e174d9c55ad62d;hp=30c4157728e083e885d37188f1fa56ed88f5425e;hb=5adc890ffae4f90536e72bc32ef83e1141689520;hpb=f8bdc6f9e7106aa7786ee19269ab9a2e4c307476

diff --git a/include/c++/orb.h b/include/c++/orb.h
index 30c4157..72daad8 100644
--- a/include/c++/orb.h
+++ b/include/c++/orb.h
@@ -327,10 +327,12 @@ namespace System {
 			const int chainlen;
 		};
 		
-		uintptr_t downcast(::System::_i_Object *obj,
-		                   const unsigned long *new_guid);
+		union GUID {
+			unsigned char c[16];
+			unsigned long l[];
+		};
 
-		typedef uint64_t GUID[2];
+		uintptr_t downcast(::System::_i_Object *obj, const GUID *new_guid);
 
 		// FIXME: use above typedef
 		static inline bool guids_equal(const unsigned long *guid1,
@@ -395,7 +397,7 @@ namespace System {
 		};
 
 		struct IFaceInfo {
-			static const uint8_t *guid;
+			const GUID *guid;
 			int (*marshall)(GrowableArray<uint8_t> &buf,
 			                GrowableArray<ID> &objlist,
 			                ParamInfoBlock::Segment *segs,