From 21eb91ae3a8578b678d71083f4513de67b2e4e0f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 3 Nov 2010 09:56:27 +0000 Subject: More include guards. Provide access for Wince. Install dummy sehmap.h --- contrib/conf-w32ce-msc/build.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'contrib/conf-w32ce-msc') diff --git a/contrib/conf-w32ce-msc/build.mk b/contrib/conf-w32ce-msc/build.mk index 4a77a99a..70cae832 100755 --- a/contrib/conf-w32ce-msc/build.mk +++ b/contrib/conf-w32ce-msc/build.mk @@ -219,15 +219,21 @@ copy-static-source: cd ../contrib/conf-w32ce-msc ; \ cp -t $(targetsrc)/gpgme/src $(conf_sources) - +# We create a dummy sehmap.h which will be included first due to -I. . +# For some reasons sehmap.h is included by MSC for WindowsCE and +# introduces a macro "leave" which conflicts of our use of "leave" for +# a label (leave and enter are pretty common names for pro- and epilog +# code). copy-built-source: @if [ ! -f ./gpgme.h ]; then \ echo "Please build using ./autogen.sh --build-w32ce first"; \ exit 1; \ fi cp -t $(targetsrc)/gpgme/src $(built_sources) + echo '/* Dummy replacement for useless header. */' \ + > $(targetsrc)/gpgme/src/sehmap.h -copy-source: copy-static-source copy-built-source +copy-source: copy-static-source copy-built-source .c.obj: -- cgit v1.2.3