From e917c07b2664bb01a5f7b5975723b90da0f396c9 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 3 Jan 2012 22:12:37 +0100 Subject: Port to npth. * configure.ac: Don't check for PTH but for NPTH. (AH_BOTTOM): Remove PTH_SYSCALL_SOFT. (have_pth): Rename to ... (have_npth): ... this. (USE_GNU_NPTH): Rename to ... (USE_GNU_PTH): ... this. * m4/npth.m4: New file. * agent/Makefile.am, agent/cache.c, agent/call-pinentry.c, agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c, agent/trustlist.c, common/Makefile.am, common/estream.c, common/exechelp-posix.c, common/exechelp-w32.c, common/exechelp-w32ce.c, common/http.c, common/init.c, common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c, dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c, dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am, g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am, scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c, scd/scdaemon.c, tools/Makefile.am: Port to npth. --- common/exechelp-w32ce.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'common/exechelp-w32ce.c') diff --git a/common/exechelp-w32ce.c b/common/exechelp-w32ce.c index 1bc2d6c3a..0583c0b53 100644 --- a/common/exechelp-w32ce.c +++ b/common/exechelp-w32ce.c @@ -35,13 +35,13 @@ #include #include -#ifdef WITHOUT_GNU_PTH /* Give the Makefile a chance to build without Pth. */ -#undef HAVE_PTH -#undef USE_GNU_PTH +#ifdef WITHOUT_NPTH /* Give the Makefile a chance to build without Pth. */ +#undef HAVE_NPTH +#undef USE_NPTH #endif -#ifdef USE_GNU_PTH -#include +#ifdef USE_NPTH +#include #endif #ifdef HAVE_STAT @@ -73,7 +73,7 @@ #define handle_to_pid(a) ((int)(a)) -#ifdef USE_GNU_PTH +#ifdef USE_NPTH /* The data passed to the feeder_thread. */ struct feeder_thread_parms { @@ -171,9 +171,9 @@ leave: xfree (parm); return NULL; } -#endif /*USE_GNU_PTH*/ +#endif /*USE_NPTH*/ -#ifdef USE_GNU_PTH +#ifdef USE_NPTH static void feeder_onclose_notification (estream_t stream, void *opaque) { @@ -182,7 +182,7 @@ feeder_onclose_notification (estream_t stream, void *opaque) log_debug ("feeder(%p): received onclose note\n", parm->hd); parm->stream_valid = 0; } -#endif /*USE_GNU_PTH*/ +#endif /*USE_NPTH*/ /* Fire up a thread to copy data between STREAM and a pipe's descriptor FD. With DIRECTION set to true the copy takes place @@ -191,7 +191,7 @@ feeder_onclose_notification (estream_t stream, void *opaque) static gpg_error_t start_feeder (estream_t stream, HANDLE hd, int direction) { -#ifdef USE_GNU_PTH +#ifdef USE_NPTH gpg_error_t err; struct feeder_thread_parms *parm; pth_attr_t tattr; -- cgit v1.2.3