[Ekiga-devel-list] Win32 DirectX

[Michael Rickmann <mrickma gwdg de>]

Ekiga SVN commit 7653 seems not complete. It is apparently based on a
discussion on this list in February:
http://mail.gnome.org/archives/ekiga-devel-list/2009-February/msg00042.html . At the moment I work with Ubuntu Intrepid on git master and get circular inclusion of uuids.h and ksuuids.h which will make the ptlib configure fail for DirectX. Attached diff corrects this. An alternative to tweaking DirectX headers may be to use them as they are ment to be used, i.e. preincluding mingw_dshow_port.h, and change ptlib.m4 accordingly.
Regards
Michael

diff -ur ekiga.orig/win32/directx/uuids.h ekiga/win32/directx/uuids.h
--- ekiga.orig/win32/directx/uuids.h	2009-04-25 18:22:19.486804883 +0200
+++ ekiga/win32/directx/uuids.h	2009-04-25 18:47:31.934780100 +0200
@@ -18,6 +18,9 @@
 //  including this file.  See wxdebug.cpp in sdk\classes\base.
 //
 
+#ifndef __UUIDS_INCLUDED__
+#define __UUIDS_INCLUDED__
+
 #ifndef OUR_GUID_ENTRY
     #define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
     DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8);
@@ -1517,3 +1520,5 @@
 #endif // __ENCODER_API_GUIDS__
 
 #undef OUR_GUID_ENTRY
+
+#endif // __UUIDS_INCLUDED__