Re: libassuan troubles

On Tuesday 20 April 2004 07:08, Werner Koch wrote:
> On Tue, 20 Apr 2004 00:04:43 +0200, Michael Nottebrock said:
> > I've checked out pinentry from CVS again and hacked at it until it
> > compiled.
>
> Aiihh.  I fixed this on Jan 30 but obviously I forgot to commit it.
> Please try the current CVS again.

My patches for assuan/mkerrors and secmem/secmem.c are still needed here. 
Without the extra newline after the EOF in assuan/mkerrors, I get

gcc -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../include  -I/usr/local/include -Wall  
-g -O2 -Wall -Wcast-align -Wshadow -Wstrict-prototypes -c `test -f 
'assuan-errors.c' || echo './'`assuan-errors.c
assuan-errors.c:94: syntax error before `-'

and without the extra typedef in secmem/secmem.c I get

gcc -DHAVE_CONFIG_H -I. -I. -I..   -I/usr/local/include -Wall  -g -O2 -Wall 
-Wcast-align -Wshadow -Wstrict-prototypes -c `test -f 'secmem.c' || echo 
'./'`secmem.c
secmem.c: In function `secmem_dump_stats':
secmem.c:445: `ulong' undeclared (first use in this function)
secmem.c:445: (Each undeclared identifier is reported only once
secmem.c:445: for each function it appears in.)
secmem.c:445: syntax error before `poollen'

Patch attached.

-- 
   ,_,   | Michael Nottebrock               | [email protected]
 (/^ ^\) | FreeBSD - The Power to Serve     | http://www.freebsd.org
   \u/   | K Desktop Environment on FreeBSD | http://freebsd.kde.org

_______________________________________________
Gpa-dev mailing list
[email protected]
http://lists.gnupg.org/mailman/listinfo/gpa-dev

Index: assuan/mkerrors
===================================================================
RCS file: /cvs/aegypten/pinentry/assuan/mkerrors,v
retrieving revision 1.1
diff -u -r1.1 mkerrors
--- assuan/mkerrors	24 Jan 2002 09:08:28 -0000	1.1
+++ assuan/mkerrors	20 Apr 2004 09:16:43 -0000
@@ -68,4 +68,4 @@
   return s;
 }
 
-EOF
\ No newline at end of file
+EOF
Index: secmem/secmem.c
===================================================================
RCS file: /cvs/aegypten/pinentry/secmem/secmem.c,v
retrieving revision 1.2
diff -u -r1.2 secmem.c
--- secmem/secmem.c	22 Dec 2003 10:48:32 -0000	1.2
+++ secmem/secmem.c	20 Apr 2004 09:16:45 -0000
@@ -55,6 +55,12 @@
     double g;
 } PROPERLY_ALIGNED_TYPE;
 
+#ifndef HAVE_ULONG_TYPEDEF
+  #undef ulong      /* maybe there is a macro with this name */
+  typedef unsigned long ulong;
+  #define HAVE_ULONG_TYPEDEF
+#endif
+
 #define log_error log_info
 #define log_bug log_fatal

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQBAhOt2Xhc68WspdLARAub+AKCERtHD5hiIaTScTGZKJA3JR1Va2wCeIgZV
WcIAenTYTN0B6G2m+dplx9o=
=gj5+
-----END PGP SIGNATURE-----