From 092c7a6be58eb76d1f65cd4609ac7e2e17e90a89 Mon Sep 17 00:00:00 2001
From: Bryan Henderson <bryanh@giraffe.netgate.net>
Date: Sun, 24 Nov 1996 04:44:24 +0000
Subject: [PATCH] Typecasts, etc. to make compile work on AIX.  Thanks Darren
 King..

---
 src/backend/storage/page/bufpage.c | 13 +++++++------
 src/backend/utils/fmgr/dfmgr.c     |  4 ++--
 src/backend/utils/mmgr/palloc.c    |  9 ++++-----
 src/bin/psql/psql.c                |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 55ef66afc57..703d9606625 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.4 1996/11/13 20:49:29 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.5 1996/11/24 04:41:29 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -304,11 +304,13 @@ struct itemIdSortData {
 };
 
 static int
-itemidcompare(struct itemIdSortData *itemidp1, struct itemIdSortData *itemidp2)
+itemidcompare(void *itemidp1, void *itemidp2)
 {
-    if (itemidp1->itemiddata.lp_off == itemidp2->itemiddata.lp_off)
+    if (((struct itemIdSortData *)itemidp1)->itemiddata.lp_off ==
+        ((struct itemIdSortData *)itemidp2)->itemiddata.lp_off)
 	return(0);
-    else if (itemidp1->itemiddata.lp_off < itemidp2->itemiddata.lp_off)
+    else if (((struct itemIdSortData *)itemidp1)->itemiddata.lp_off <
+             ((struct itemIdSortData *)itemidp2)->itemiddata.lp_off)
 	return(1);
     else
 	return(-1);
@@ -325,7 +327,6 @@ PageRepairFragmentation(Page page)
     struct itemIdSortData 	*itemidbase, *itemidptr;
     ItemId 		lp;
     int 		nline, nused;
-    int 		itemidcompare();
     Offset 		upper;
     Size 		alignedSize;
     
@@ -364,7 +365,7 @@ PageRepairFragmentation(Page page)
 	
 	/* sort itemIdSortData array...*/
 	pg_qsort((char *) itemidbase, nused, sizeof(struct itemIdSortData),
-		 (void*) itemidcompare);
+		 itemidcompare);
 	
 	/* compactify page */
 	((PageHeader)page)->pd_upper = ((PageHeader)page)->pd_special;
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index a0f675f655b..5386afd6a81 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.2 1996/11/10 02:26:15 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.3 1996/11/24 04:44:14 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -204,7 +204,7 @@ handle_load(char *filename, char *funcname)
 	    return((func_ptr) NULL);
     }
     
-    retval = pg_dlsym(file_scanner->handle, funcname);
+    retval = (func_ptr) pg_dlsym(file_scanner->handle, funcname);
     
     if (retval == (func_ptr) NULL) {
 	elog(WARN, "Can't find function %s in file %s", funcname, filename);
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index 725cf171c85..c3b9ec77ccc 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.1.1.1 1996/07/09 06:22:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.2 1996/11/24 04:44:17 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -109,9 +109,8 @@ pstrdup(char* string)
 {
     char *nstr;
 
-    nstr = strcpy((char *)palloc(strlen(string)+1), string);
+    nstr = (char *)palloc(strlen(string)+1);
+    strcpy(nstr, string);
+
     return nstr;
 }
-
-
-
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 8b22ecf70cb..5d0ce15fe37 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.32 1996/11/22 06:45:14 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.33 1996/11/24 04:44:24 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -739,7 +739,7 @@ do_copy(const char *args, PsqlSettings * settings)
 	} else {
 	    copystream = fopen(file, "w");
 	}
-	if (copystream < 0)
+	if (copystream == NULL)
 	    fprintf(stderr,
 		    "Unable to open file %s which to copy, errno = %s (%d).",
 		    from ? "from" : "to", strerror(errno), errno);