[svn] gpgme - r1096 - in trunk: . gpgme
svn author marcus
cvs at cvs.gnupg.org
Mon Sep 12 21:14:38 CEST 2005
Author: marcus
Date: 2005-09-12 21:14:36 +0200 (Mon, 12 Sep 2005)
New Revision: 1096
Removed:
trunk/gpgme/ath-compat.c
trunk/gpgme/ath-pth-compat.c
trunk/gpgme/ath-pthread-compat.c
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/gpgme/ChangeLog
trunk/gpgme/Makefile.am
trunk/gpgme/ath.h
trunk/gpgme/posix-sema.c
Log:
2005-09-12 Marcus Brinkmann <marcus at g10code.de>
* configure.ac (HAVE_PTH): Don't add $PTH_CFLAGS to $CFLAGS here.
gpgme/
2005-09-12 Marcus Brinkmann <marcus at g10code.de>
* Makefile.am (libgpgme_la_SOURCES): Set to ath.h and ath.c.
(ath_pth_src, ath_pthread_src): Removed.
(w32_o_files): Replace ath-compat.o with ath.o.
(libgpgme_pth_la_CFLAGS): New variable.
* ath-compat.c, ath-pthread-compat.c, ath-pth-compat.c: Removed.
* ath.h (ath_pthread_available, ath_pth_available): Removed.
(ath_init) [!_ATH_EXT_SYM_PREFIX]: Do not define macro.
(struct ath_ops, ath_init) [_ATH_COMPAT]: Removed.
(_ATH_COMPAT): Macro removed.
* posix-sema.c (_gpgme_sema_subsystem_init): Do not call
_gpgme_ath_init.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-09-12 19:08:29 UTC (rev 1095)
+++ trunk/ChangeLog 2005-09-12 19:14:36 UTC (rev 1096)
@@ -1,3 +1,7 @@
+2005-09-12 Marcus Brinkmann <marcus at g10code.de>
+
+ * configure.ac (HAVE_PTH): Don't add $PTH_CFLAGS to $CFLAGS here.
+
2005-08-26 Werner Koch <wk at g10code.com>
* configure.ac (SEPCONSTANTS): New to define DIRSEP_C et al.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2005-09-12 19:08:29 UTC (rev 1095)
+++ trunk/NEWS 2005-09-12 19:14:36 UTC (rev 1096)
@@ -1,12 +1,6 @@
Noteworthy changes in version 1.1.0 (unreleased)
------------------------------------------------
- * "./autogen.sh --build-w32" does now build gpgme.dll.
-
- * [W32] The environment variable GPGME_DEBUG now uses a semicolon as
- delimiter. The standard install directory is used when locating
- gpg or gpgsm before finally falling back to the hardwired name.
-
* You can now configure the backend engine file name and home
directory to be used, as default and per context.
@@ -27,6 +21,22 @@
if available is made available in the new field plaintext_filename
of the respective result structure.
+ * The code for "automagically detecting the thread library" has been
+ removed from libgpgme. It is deprecated since version 0.4.3.
+ Since then, you had to link against libgpgme-pthread for
+ applications using pthread and libgpgme-pth for applications using
+ GNU Pth.
+
+ The code was removed because it caused compilation problems on
+ systems where the pthread.h header from GNU Pth is available in
+ addition to the system header (FreeBSD 6 and later for example).
+
+ * "./autogen.sh --build-w32" does now build gpgme.dll.
+
+ * [W32] The environment variable GPGME_DEBUG now uses a semicolon as
+ delimiter. The standard install directory is used when locating
+ gpg or gpgsm before finally falling back to the hardwired name.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
gpgme_set_engine_info NEW
gpgme_ctx_get_engine_info NEW
Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog 2005-09-12 19:08:29 UTC (rev 1095)
+++ trunk/gpgme/ChangeLog 2005-09-12 19:14:36 UTC (rev 1096)
@@ -1,5 +1,19 @@
2005-09-12 Marcus Brinkmann <marcus at g10code.de>
+ * Makefile.am (libgpgme_la_SOURCES): Set to ath.h and ath.c.
+ (ath_pth_src, ath_pthread_src): Removed.
+ (w32_o_files): Replace ath-compat.o with ath.o.
+ (libgpgme_pth_la_CFLAGS): New variable.
+ * ath-compat.c, ath-pthread-compat.c, ath-pth-compat.c: Removed.
+ * ath.h (ath_pthread_available, ath_pth_available): Removed.
+ (ath_init) [!_ATH_EXT_SYM_PREFIX]: Do not define macro.
+ (struct ath_ops, ath_init) [_ATH_COMPAT]: Removed.
+ (_ATH_COMPAT): Macro removed.
+ * posix-sema.c (_gpgme_sema_subsystem_init): Do not call
+ _gpgme_ath_init.
+
+2005-09-12 Marcus Brinkmann <marcus at g10code.de>
+
* keylist.c (release_op_data): Do not free opd->tmp_uid.
2005-08-26 Marcus Brinkmann <marcus at g10code.de>
Modified: trunk/gpgme/Makefile.am
===================================================================
--- trunk/gpgme/Makefile.am 2005-09-12 19:08:29 UTC (rev 1095)
+++ trunk/gpgme/Makefile.am 2005-09-12 19:14:36 UTC (rev 1096)
@@ -83,18 +83,7 @@
$(gpgsm_components) sema.h priv-io.h $(system_components) \
debug.c debug.h gpgme.c version.c error.c
-# libgpgme_la_SOURCES = ath.h ath.c
-if HAVE_PTH
- ath_pth_src = ath-pth-compat.c
-else
- ath_pth_src =
-endif
-if HAVE_PTHREAD
- ath_pthread_src = ath-pthread-compat.c
-else
- ath_pthread_src =
-endif
-libgpgme_la_SOURCES = ath.h ath-compat.c $(ath_pth_src) $(ath_pthread_src)
+libgpgme_la_SOURCES = ath.h ath.c
libgpgme_pthread_la_SOURCES = ath.h ath-pthread.c
libgpgme_pth_la_SOURCES = ath.h ath-pth.c
@@ -114,6 +103,7 @@
libgpgme_pthread_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \
-lpthread @GPG_ERROR_LIBS@
+libgpgme_pth_la_CFLAGS = $(AM_CFLAGS) @PTH_CFLAGS@
libgpgme_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @PTH_CPPFLAGS@
libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
$(libgpgme_version_script_cmd) -version-info \
@@ -130,7 +120,7 @@
# able to do this properly; we better use gcc's built in magic.
if HAVE_W32_SYSTEM
-w32_o_files = ath-compat.o conversion.o data-compat.o data-fd.o \
+w32_o_files = ath.o conversion.o data-compat.o data-fd.o \
data-mem.o data-stream.o data-user.o data.o debug.o \
decrypt-verify.o decrypt.o delete.o edit.o encrypt-sign.o \
encrypt.o engine-gpgsm.o engine.o error.o export.o genkey.o \
Deleted: trunk/gpgme/ath-compat.c
Deleted: trunk/gpgme/ath-pth-compat.c
Deleted: trunk/gpgme/ath-pthread-compat.c
Modified: trunk/gpgme/ath.h
===================================================================
--- trunk/gpgme/ath.h 2005-09-12 19:08:29 UTC (rev 1095)
+++ trunk/gpgme/ath.h 2005-09-12 19:14:36 UTC (rev 1096)
@@ -86,34 +86,4 @@
int ath_sendmsg (int s, const struct msghdr *msg, int flags);
int ath_recvmsg (int s, struct msghdr *msg, int flags);
-#define _ATH_COMPAT
-#ifdef _ATH_COMPAT
-struct ath_ops
-{
- int (*mutex_init) (void **priv, int just_check);
- int (*mutex_destroy) (void *priv);
- int (*mutex_lock) (void *priv);
- int (*mutex_unlock) (void *priv);
- ssize_t (*read) (int fd, void *buf, size_t nbytes);
- ssize_t (*write) (int fd, const void *buf, size_t nbytes);
- ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
- struct timeval *timeout);
- ssize_t (*waitpid) (pid_t pid, int *status, int options);
- int (*accept) (int s, struct sockaddr *addr, socklen_t *length_ptr);
- int (*connect) (int s, const struct sockaddr *addr, socklen_t length);
- int (*sendmsg) (int s, const struct msghdr *msg, int flags);
- int (*recvmsg) (int s, struct msghdr *msg, int flags);
-};
-
-/* Initialize the any-thread package. */
-#define ath_init _ATH_PREFIX(ath_init)
-void ath_init (void);
-
-/* Used by ath_pkg_init. */
-#define ath_pthread_available _ATH_PREFIX(ath_pthread_available)
-struct ath_ops *ath_pthread_available (void);
-#define ath_pth_available _ATH_PREFIX(ath_pth_available)
-struct ath_ops *ath_pth_available (void);
-#endif
-
#endif /* ATH_H */
Modified: trunk/gpgme/posix-sema.c
===================================================================
--- trunk/gpgme/posix-sema.c 2005-09-12 19:08:29 UTC (rev 1095)
+++ trunk/gpgme/posix-sema.c 2005-09-12 19:14:36 UTC (rev 1096)
@@ -40,8 +40,6 @@
void
_gpgme_sema_subsystem_init ()
{
- /* FIXME: we should check that there is only one thread running */
- _gpgme_ath_init ();
}
void
More information about the Gnupg-commits
mailing list