[svn] gpgme - r1500 - in trunk: . contrib contrib/conf-w32ce-msc src

[svn author wk]

Author: wk
Date: 2010-11-04 09:16:57 +0100 (Thu, 04 Nov 2010)
New Revision: 1500

Removed:
   trunk/src/memrchr.c
Modified:
   trunk/THANKS
   trunk/contrib/ChangeLog
   trunk/contrib/conf-w32ce-msc/build.mk
   trunk/src/ChangeLog
   trunk/src/export.c
   trunk/src/w32-ce.h
Log:
More changes for W32CE with MSC.


Modified: trunk/contrib/ChangeLog
===================================================================
--- trunk/contrib/ChangeLog	2010-11-03 10:33:10 UTC (rev 1499)
+++ trunk/contrib/ChangeLog	2010-11-04 08:16:57 UTC (rev 1500)
@@ -1,3 +1,8 @@
+2010-11-04  Werner Koch  <wk at g10code.com>
+
+	* conf-w32ce-msc/build.mk (copy-built-source): Revert last
+	change.  Does not work with W32CE where MSC defines it in except.h.
+
 2010-11-03  Werner Koch  <wk at g10code.com>
 
 	* conf-w32ce-msc/build.mk (copy-built-source): Create dummy sehmap.h.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-11-03 10:33:10 UTC (rev 1499)
+++ trunk/src/ChangeLog	2010-11-04 08:16:57 UTC (rev 1500)
@@ -1,3 +1,11 @@
+2010-11-04  Werner Koch  <wk at g10code.com>
+
+	* w32-ce.h [_MSC_VER && W32CE]: Undef leave.
+	* export.c: Include util.h so that we get the above undef.
+
+	* memrchr.c: Remove.  Used to be a replacement function required
+	by the formerly included assuan code.
+
 2010-11-03  Werner Koch  <wk at g10code.com>
 
 	* debug.c (_gpgme_debug) [W32CE]: Replace locatime by GetLocalTime.

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2010-11-03 10:33:10 UTC (rev 1499)
+++ trunk/THANKS	2010-11-04 08:16:57 UTC (rev 1500)
@@ -17,12 +17,13 @@
 Mark Mutz               mutz at kde.org
 Miguel Coca		mcoca at gnu.org
 Noel Torres		envite at rolamasao.org
+Patrick Spendrin        patrick.spendrin at kdab.com
 Stéphane Corthésy       stephane at sente.ch
 Timo Schulz             twoaday at freakmail.de
 Tommy Reynolds          reynolds at redhat.com
                         
 
- Copyright 2001, 2002, 2004 g10 Code GmbH
+ Copyright 2001, 2002, 2004, 2010 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without

Modified: trunk/contrib/conf-w32ce-msc/build.mk
===================================================================
--- trunk/contrib/conf-w32ce-msc/build.mk	2010-11-03 10:33:10 UTC (rev 1499)
+++ trunk/contrib/conf-w32ce-msc/build.mk	2010-11-04 08:16:57 UTC (rev 1500)
@@ -219,19 +219,13 @@
 	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
+	echo '/* Dummy io.h header. */' > $(targetsrc)/gpgme/src/io.h
 
 copy-source: copy-static-source copy-built-source 
 

Modified: trunk/src/export.c
===================================================================
--- trunk/src/export.c	2010-11-03 10:33:10 UTC (rev 1499)
+++ trunk/src/export.c	2010-11-04 08:16:57 UTC (rev 1500)
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "gpgme.h"
+#include "util.h"
 #include "debug.h"
 #include "context.h"
 #include "ops.h"

Modified: trunk/src/w32-ce.h
===================================================================
--- trunk/src/w32-ce.h	2010-11-03 10:33:10 UTC (rev 1499)
+++ trunk/src/w32-ce.h	2010-11-04 08:16:57 UTC (rev 1500)
@@ -75,6 +75,11 @@
                             int (*compar) (const void *, const void *));
 #define bsearch(a,b,c,d,e) _gpgme_wince_bsearch ((a),(b),(c),(d),(e)) 
 
+/* Remove the redefined __leave keyword.  It is defined by MSC for W32
+   in excpt.h and not in sehmap.h as for the plain windows
+   version.  */
+#if defined(_MSC_VER) && defined(HAVE_W32CE_SYSTEM)
+# undef leave
+#endif
 
-
 #endif /* GPGME_W32_CE_H */