[svn] GnuPG - r3952 - trunk/cipher

svn author dshaw cvs at cvs.gnupg.org
Tue Dec 6 21:27:44 CET 2005


Author: dshaw
Date: 2005-12-06 21:27:43 +0100 (Tue, 06 Dec 2005)
New Revision: 3952

Modified:
   trunk/cipher/ChangeLog
   trunk/cipher/idea-stub.c
   trunk/cipher/rndegd.c
   trunk/cipher/rndlinux.c
   trunk/cipher/rndunix.c
   trunk/cipher/rndw32.c
Log:
* idea-stub.c (load_module): Not legal to return a void * as a function
pointer.


Modified: trunk/cipher/ChangeLog
===================================================================
--- trunk/cipher/ChangeLog	2005-12-06 18:49:34 UTC (rev 3951)
+++ trunk/cipher/ChangeLog	2005-12-06 20:27:43 UTC (rev 3952)
@@ -1,9 +1,13 @@
 2005-12-06  David Shaw  <dshaw at jabberwocky.com>
 
-	* Makefile.am: Some cleanup so we don't build files that are
-	completely ifdeffed out.  This causes a warning on Sun's cc.  Do
-	sha512.c as well for consistency.
+	* idea-stub.c (load_module): Not legal to return a void * as a
+	function pointer.
 
+	* Makefile.am, rndegd.c, rndlinux.c, rndunix.c, rndw32.c: Some
+	cleanup so we don't build files that are completely ifdeffed out.
+	This causes a warning on Sun's cc.  Do sha512.c as well for
+	consistency.
+
 2005-08-11  Werner Koch  <wk at g10code.com>
 
 	* rijndael.c (rijndael_cfb_encrypt): Experimental code to improve

Modified: trunk/cipher/idea-stub.c
===================================================================
--- trunk/cipher/idea-stub.c	2005-12-06 18:49:34 UTC (rev 3951)
+++ trunk/cipher/idea-stub.c	2005-12-06 20:27:43 UTC (rev 3952)
@@ -138,7 +138,7 @@
   if ((err=dlerror())) 
     goto failure;
 
-  return sym;
+  return (INFO_FNC)sym;
   
  failure:
   log_info ("invalid module `%s': %s\n", name?name:"???", err?err:"???");

Modified: trunk/cipher/rndegd.c
===================================================================
--- trunk/cipher/rndegd.c	2005-12-06 18:49:34 UTC (rev 3951)
+++ trunk/cipher/rndegd.c	2005-12-06 20:27:43 UTC (rev 3952)
@@ -20,9 +20,6 @@
  */
 
 #include <config.h>
-
-#ifdef USE_RNDEGD
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -226,5 +223,3 @@
 
     return 0; /* success */
 }
-
-#endif /*USE_RNDEGD*/

Modified: trunk/cipher/rndlinux.c
===================================================================
--- trunk/cipher/rndlinux.c	2005-12-06 18:49:34 UTC (rev 3951)
+++ trunk/cipher/rndlinux.c	2005-12-06 20:27:43 UTC (rev 3952)
@@ -21,9 +21,6 @@
 
 
 #include <config.h>
-
-#ifdef USE_RNDLINUX
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -161,5 +158,3 @@
 
     return 0; /* success */
 }
-
-#endif /*USE_RNDLINUX*/

Modified: trunk/cipher/rndunix.c
===================================================================
--- trunk/cipher/rndunix.c	2005-12-06 18:49:34 UTC (rev 3951)
+++ trunk/cipher/rndunix.c	2005-12-06 20:27:43 UTC (rev 3952)
@@ -48,9 +48,6 @@
 /* General includes */
 
 #include <config.h>
-
-#ifdef USE_RNDUNIX
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -870,5 +867,3 @@
 
     return 0;
 }
-
-#endif /*USE_RNDUNIX*/

Modified: trunk/cipher/rndw32.c
===================================================================
--- trunk/cipher/rndw32.c	2005-12-06 18:49:34 UTC (rev 3951)
+++ trunk/cipher/rndw32.c	2005-12-06 20:27:43 UTC (rev 3952)
@@ -61,9 +61,6 @@
  */
 
 #include <config.h>
-
-#ifdef USE_RNDW32
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -700,5 +697,3 @@
 
     return 0;
 }
-
-#endif /*USE_RNDW32*/




More information about the Gnupg-commits mailing list