Commita62e2c2

committed

Replace unnecessary DISABLE_ZLIB define in pgcrypto with HAVE_LIBZ from core.

Patch from Marko Kreen.

1 parent2f8f76b commita62e2c2Copy full SHA for a62e2c2

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.24 2006/07/13 04:15:24 neilc Exp $`
	`2`	`+# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.25 2007/01/14 20:55:14 alvherre Exp $`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`INT_SRCS = md5.c sha1.c sha2.c internal.c internal-sha2.c blf.c rijndael.c\`
`@@ -9,17 +9,13 @@ INT_TESTS = sha2`
`9`	`9`	`OSSL_SRCS = openssl.c pgp-mpi-openssl.c`
`10`	`10`	`OSSL_TESTS = sha2 des 3des cast5`
`11`	`11`
`12`		`-ZLIB_OFF_CFLAGS = -DDISABLE_ZLIB`
`13`	`12`	`ZLIB_TST = pgp-compression`
`14`	`13`	`ZLIB_OFF_TST = pgp-zlib-DISABLED`
`15`	`14`
`16`	`15`	`CF_SRCS =$(if$(subst no,,$(with_openssl)),$(OSSL_SRCS),$(INT_SRCS))`
`17`	`16`	`CF_TESTS =$(if$(subst no,,$(with_openssl)),$(OSSL_TESTS),$(INT_TESTS))`
`18`		`-CF_CFLAGS =$(if$(subst yes,,$(with_zlib)),$(ZLIB_OFF_CFLAGS))`
`19`	`17`	`CF_PGP_TESTS =$(if$(subst no,,$(with_zlib)),$(ZLIB_TST),$(ZLIB_OFF_TST))`
`20`	`18`
`21`		`-PG_CPPFLAGS=$(CF_CFLAGS)`
`22`		`-`
`23`	`19`	`SRCS= pgcrypto.c px.c px-hmac.c px-crypt.c\`
`24`	`20`	`crypt-gensalt.c crypt-blowfish.c crypt-des.c\`
`25`	`21`	`crypt-md5.c$(CF_SRCS)\`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`27`	`27`	`* SUCH DAMAGE.`
`28`	`28`	`*`
`29`		`- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-compress.c,v 1.5 2005/10/15 02:49:06 momjian Exp $`
	`29`	`+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-compress.c,v 1.6 2007/01/14 20:55:14 alvherre Exp $`
`30`	`30`	`*/`
`31`	`31`
`32`	`32`	`#include"postgres.h"`
`@@ -40,7 +40,7 @@`
`40`	`40`	`* Compressed pkt writer`
`41`	`41`	`*/`
`42`	`42`
`43`		`-#ifndefDISABLE_ZLIB`
	`43`	`+#ifdefHAVE_LIBZ`
`44`	`44`
`45`	`45`	`#include<zlib.h>`
`46`	`46`
`@@ -312,7 +312,8 @@ pgp_decompress_filter(PullFilter ** res, PGP_Context * ctx, PullFilter * src)`
`312`	`312`	`{`
`313`	`313`	`returnpullf_create(res,&decompress_filter,ctx,src);`
`314`	`314`	`}`
`315`		`-#else/* DISABLE_ZLIB */`
	`315`	`+`
	`316`	`+#else/* !HAVE_ZLIB */`
`316`	`317`
`317`	`318`	`int`
`318`	`319`	`pgp_compress_filter(PushFilter*res,PGP_Contextctx,PushFilter*dst)`

Comments

(0)