Reverted changes to pragmas that pull bonobo idl into at-spi idl,

since they broke the build in some important environments.
see bug #313122.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@844 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index b767326..4a8fa80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-21  Bill Haneman <billh@gnome.org>
+
+       * idl/Accessibility.idl:
+       Reverted pragma changes, this broke the build in some envs
+       including the Debian team's build and some tinderbox builds.
+       
 2006-07-19  Bill Haneman <billh@gnome.org> modifications to patch from
 
        * configure.in:

diff --git a/idl/Accessibility.idl b/idl/Accessibility.idl
index 6822f22..c5be877 100644 (file)
--- a/idl/Accessibility.idl
+++ b/idl/Accessibility.idl
@@ -33,17 +33,6 @@
 #endif
 
 #ifndef _BONOBO_IDL_INCLUDED_
-#ifdef __ORBIT_IDL__
-%{
-#pragma include_defs bonobo/Bonobo.h
-%}
-#pragma inhibit push
-#endif
-#include <Bonobo_Unknown.idl>
-#ifdef __ORBIT_IDL__
-#pragma inhibit pop
-#endif
-
 #define _BONOBO_IDL_INCLUDED_
 #include <Bonobo_Unknown.idl>
 #endif /* _BONOBO_IDL_INCLUDED_ */