Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 10a3b16

Browse files
committed
pgcrypto: Make header files stand alone
pgp.h used to require including mbuf.h and px.h first. Include those in pgp.h, so that it can be used without prerequisites. Remove mbuf.h inclusions in .c files where mbuf.h features are not used directly. (px.h was always used.)
1 parent 220b343 commit 10a3b16

11 files changed

+3
-10
lines changed

contrib/pgcrypto/pgp-armor.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "postgres.h"
3333

3434
#include "px.h"
35-
#include "mbuf.h"
3635
#include "pgp.h"
3736

3837
/*

contrib/pgcrypto/pgp-cfb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#include "postgres.h"
3333

34-
#include "mbuf.h"
3534
#include "px.h"
3635
#include "pgp.h"
3736

contrib/pgcrypto/pgp-compress.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#include "postgres.h"
3333

34-
#include "mbuf.h"
3534
#include "px.h"
3635
#include "pgp.h"
3736

contrib/pgcrypto/pgp-mpi-internal.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "imath.h"
3434

3535
#include "px.h"
36-
#include "mbuf.h"
3736
#include "pgp.h"
3837

3938
static mpz_t *

contrib/pgcrypto/pgp-mpi-openssl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include <openssl/bn.h>
3434

3535
#include "px.h"
36-
#include "mbuf.h"
3736
#include "pgp.h"
3837

3938
static BIGNUM *

contrib/pgcrypto/pgp-mpi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "postgres.h"
3232

3333
#include "px.h"
34-
#include "mbuf.h"
3534
#include "pgp.h"
3635

3736
int

contrib/pgcrypto/pgp-pubdec.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "postgres.h"
3232

3333
#include "px.h"
34-
#include "mbuf.h"
3534
#include "pgp.h"
3635

3736
/*

contrib/pgcrypto/pgp-pubenc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "postgres.h"
3232

3333
#include "px.h"
34-
#include "mbuf.h"
3534
#include "pgp.h"
3635

3736
/*

contrib/pgcrypto/pgp-s2k.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "postgres.h"
3333

3434
#include "px.h"
35-
#include "mbuf.h"
3635
#include "pgp.h"
3736

3837
static int

contrib/pgcrypto/pgp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "postgres.h"
3333

3434
#include "px.h"
35-
#include "mbuf.h"
3635
#include "pgp.h"
3736

3837
/*

contrib/pgcrypto/pgp.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
* contrib/pgcrypto/pgp.h
3030
*/
3131

32+
#include "mbuf.h"
33+
#include "px.h"
34+
3235
enum PGP_S2K_TYPE
3336
{
3437
PGP_S2K_SIMPLE = 0,

0 commit comments

Comments
 (0)