summaryrefslogtreecommitdiff
path: root/contrib/pgcrypto/px.h
diff options
context:
space:
mode:
authorNeil Conway2005-03-21 05:18:46 +0000
committerNeil Conway2005-03-21 05:18:46 +0000
commitfa332a06ecffaa027a0b09cdd1907a03d4318911 (patch)
treea2250749d6e07f2fdec09ee57ee0a3f406888df2 /contrib/pgcrypto/px.h
parent3cc866123224ec1cd9b2deeb4d63c39c6ef9e533 (diff)
* construct "struct {} list [] = {}" confuses pgindent - split those.
It was a bad style to begin with, and now several loops can be clearer. * pgcrypto.c: Fix function comments * crypt-gensalt.c, crypt-blowfish.c: stop messing with errno * openssl.c: use px_free instead pfree * px.h: make redefining px_alloc/px_realloc/px_free easier Marko Kreen
Diffstat (limited to 'contrib/pgcrypto/px.h')
-rw-r--r--contrib/pgcrypto/px.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
index e2feef1af2..bea351cd3d 100644
--- a/contrib/pgcrypto/px.h
+++ b/contrib/pgcrypto/px.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/px.h,v 1.9 2003/11/29 22:39:28 pgsql Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/px.h,v 1.10 2005/03/21 05:18:46 neilc Exp $
*/
#ifndef __PX_H
@@ -43,21 +43,18 @@
#endif
-#if 1
+#ifndef PX_OWN_ALLOC
#define px_alloc(s) palloc(s)
-#define px_realloc(p, s) prealloc(p, s)
+#define px_realloc(p, s) repalloc(p, s)
#define px_free(p) pfree(p)
#else
-void *xalloc(size_t s);
-void *xrealloc(void *p, size_t s);
-void xfree(void *p);
+void *px_alloc(size_t s);
+void *px_realloc(void *p, size_t s);
+void px_free(void *p);
-#define px_alloc(s) xalloc(s)
-#define px_realloc(p, s) xrealloc(p, s)
-#define px_free(p) xfree(p)
#endif
/* max len of 'type' parms */