Persuade new pgcrypto stuff to compile.

diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h
index bb6b66f..daf9703 100644 (file)
--- a/contrib/pgcrypto/blf.h
+++ b/contrib/pgcrypto/blf.h
@@ -57,26 +57,26 @@ typedef struct BlowfishContext {
  *     Blowfish_expand0state( state, key, keylen )
  */
 
-void Blowfish_encipher __P((blf_ctx *, uint32 *));
-void Blowfish_decipher __P((blf_ctx *, uint32 *));
-void Blowfish_initstate __P((blf_ctx *));
-void Blowfish_expand0state __P((blf_ctx *, const uint8 *, uint16));
+void Blowfish_encipher (blf_ctx *, uint32 *);
+void Blowfish_decipher (blf_ctx *, uint32 *);
+void Blowfish_initstate (blf_ctx *);
+void Blowfish_expand0state (blf_ctx *, const uint8 *, uint16);
 void Blowfish_expandstate
-    __P((blf_ctx *, const uint8 *, uint16, const uint8 *, uint16));
+    (blf_ctx *, const uint8 *, uint16, const uint8 *, uint16);
 
 /* Standard Blowfish */
 
-void blf_key __P((blf_ctx *, const uint8 *, uint16));
-void blf_enc __P((blf_ctx *, uint32 *, uint16));
-void blf_dec __P((blf_ctx *, uint32 *, uint16));
+void blf_key (blf_ctx *, const uint8 *, uint16);
+void blf_enc (blf_ctx *, uint32 *, uint16);
+void blf_dec (blf_ctx *, uint32 *, uint16);
 
 /* Converts uint8 to uint32 */
-uint32 Blowfish_stream2word __P((const uint8 *, uint16 ,
-                                   uint16 *));
+uint32 Blowfish_stream2word (const uint8 *, uint16, uint16 *);
 
-void blf_ecb_encrypt __P((blf_ctx *, uint8 *, uint32));
-void blf_ecb_decrypt __P((blf_ctx *, uint8 *, uint32));
+void blf_ecb_encrypt (blf_ctx *, uint8 *, uint32);
+void blf_ecb_decrypt (blf_ctx *, uint8 *, uint32);
+
+void blf_cbc_encrypt (blf_ctx *, uint8 *, uint8 *, uint32);
+void blf_cbc_decrypt (blf_ctx *, uint8 *, uint8 *, uint32);
 
-void blf_cbc_encrypt __P((blf_ctx *, uint8 *, uint8 *, uint32));
-void blf_cbc_decrypt __P((blf_ctx *, uint8 *, uint8 *, uint32));
 #endif

diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c
index e4cb6d7..15a88aa 100644 (file)
--- a/contrib/pgcrypto/rijndael.c
+++ b/contrib/pgcrypto/rijndael.c
@@ -45,7 +45,7 @@ Mean:          500 cycles =    51.2 mbits/sec
 #define PRE_CALC_TABLES
 #define LARGE_TABLES
 
-static void gen_tabs   __P((void));
+static void gen_tabs(void);
 
 /* 3. Basic macros for speeding up generic operations               */
 

diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h
index 9d95877..bdefda8 100644 (file)
--- a/contrib/pgcrypto/rijndael.h
+++ b/contrib/pgcrypto/rijndael.h
@@ -41,9 +41,9 @@ typedef struct _rijndael_ctx {
 /* require endian conversions for big-endian architectures          */
 
 rijndael_ctx *
-rijndael_set_key __P((rijndael_ctx *, const u4byte *, const u4byte, int));
-void rijndael_encrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
-void rijndael_decrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
+rijndael_set_key (rijndael_ctx *, const u4byte *, const u4byte, int);
+void rijndael_encrypt (rijndael_ctx *, const u4byte *, u4byte *);
+void rijndael_decrypt (rijndael_ctx *, const u4byte *, u4byte *);
 
 /* conventional interface */