security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-30 22:27:56 +02:00
Code Activity

Fix left over use of jnlib on some platforms

Browse Source 
* tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.

--

Also fixed in some comments.
This commit is contained in:
Werner Koch 2012-08-24 09:29:56 +02:00
parent 4ea37fe4b2
commit 8156a38674
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/srv.c
View File

@ -326,6 +326,6 @@ main(int argc,char *argv[])
/* /*
Local Variables: Local Variables:
compile-command: "cc -DTEST -I.. -I../include -Wall -g -o srv srv.c -lresolv ../tools/no-libgcrypt.o ../jnlib/libjnlib.a" compile-command: "cc -DTEST -I.. -I../include -Wall -g -o srv srv.c -lresolv ../tools/no-libgcrypt.o ../common/libcommon.a"
End: End:
*/ */

2
scd/Makefile.am
View File

@ -61,7 +61,7 @@ scdaemon_LDADD = $(libcommonpth) ../gl/libgnu.a \
# app.c app-common.h app-help.c $(card_apps) # app.c app-common.h app-help.c $(card_apps)
# #
#sc_copykeys_LDADD = \ #sc_copykeys_LDADD = \
# ../jnlib/libjnlib.a ../common/libcommon.a \ # ../common/libcommon.a \
# ../common/libsimple-pwquery.a \ # ../common/libsimple-pwquery.a \
# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \ # $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
# $(LIBUSB_LIBS) \ # $(LIBUSB_LIBS) \

2
tools/no-libgcrypt.c
View File

@ -22,7 +22,7 @@
/* Replace libgcrypt's malloc functions which are used by /* Replace libgcrypt's malloc functions which are used by
../jnlib/libjnlib.a . ../common/util.h defines macros to map them ../common/libcommon.a . ../common/util.h defines macros to map them
to xmalloc etc. */ to xmalloc etc. */
static void static void
out_of_memory (void) out_of_memory (void)

2
tools/watchgnupg.c
View File

@ -47,7 +47,7 @@
#endif #endif
#if !defined(SUN_LEN) || !defined(PF_LOCAL) || !defined(AF_LOCAL) #if !defined(SUN_LEN) || !defined(PF_LOCAL) || !defined(AF_LOCAL)
#define JNLIB_NEED_AFLOCAL #define JNLIB_NEED_AFLOCAL
#include "../jnlib/mischelp.h" #include "../common/mischelp.h"
#endif #endif