From 1bcb85428a3695ee17c2edfcfc2ad22950962a7d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 28 Dec 2005 08:54:08 +0000 Subject: Guard against generating code when running this through the IDL compiler 2005-12-22 Tor Lillqvist * Evolution-Shell.idl: Guard against generating code when running this through the IDL compiler elsewhere than here in evo/shell, the same way as in Evolution-Component.idl. Otherwise we get duplicated IDL-generated functions in the libeshell and libevolution-mail DLLs (shared libraries), which causes much pain on Win32 at least, and is useless and potentially risky on all platforms. svn path=/trunk/; revision=30966 --- shell/Evolution-Shell.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'shell/Evolution-Shell.idl') diff --git a/shell/Evolution-Shell.idl b/shell/Evolution-Shell.idl index c5999c9776..49875ea95a 100644 --- a/shell/Evolution-Shell.idl +++ b/shell/Evolution-Shell.idl @@ -13,6 +13,15 @@ #include +#ifndef __evolution_shell_COMPILATION +#ifdef __ORBIT_IDL__ +%{ +#pragma include_defs shell/evolution-component.h +%} +#pragma inhibit push +#endif +#endif + module GNOME { module Evolution { @@ -69,4 +78,9 @@ module Evolution { }; }; +#ifndef __evolution_shell_COMPILATION +#ifdef __ORBIT_IDL__ +#pragma inhibit pop +#endif #endif +#endif /* _GNOME_EVOLUTION_SHELL_IDL */ -- cgit v1.2.3