diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 81973e34f6..ad1d13fdf2 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.123 2000/03/11 03:08:36 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.124 2000/03/23 17:27:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1080,7 +1080,7 @@ PQconnectPoll(PGconn *conn)
 #else
 			char optval;
 #endif
-			int optlen = sizeof(optval);
+			SOCKET_SIZE_TYPE optlen = sizeof(optval);
 
 			/* Write ready, since we've made it here, so the connection
 			 * has been made. */
diff --git a/src/template/aix_42 b/src/template/aix_42
index 49f3a69041..a0ed5a9c04 100644
--- a/src/template/aix_42
+++ b/src/template/aix_42
@@ -1,5 +1,5 @@
 AROPT:crs
-CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero -qlonglong
+CFLAGS:-O2 -qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong -qcpluscmt
 SHARED_LIB:-lc
 ALL:
 SRCH_INC:
diff --git a/src/test/regress/resultmap b/src/test/regress/resultmap
index faa8577f2c..a325a3be0d 100644
--- a/src/test/regress/resultmap
+++ b/src/test/regress/resultmap
@@ -15,6 +15,8 @@ int4/powerpc-unknown-linux-gnu=int4-not-representable
 int2/.*-qnx4=int2-too-large
 int4/.*-qnx4=int4-too-large
 int8/.*-qnx4=int8-exp-three-digits
+int2/.*-aix4=int2-too-large
+int4/.*-aix4=int4-too-large
 float8/alpha-dec-osf=float8-fp-exception
 float4/.*-qnx4=float4-exp-three-digits
 float8/.*-qnx4=float8-exp-three-digits