diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index aeed8908036fd1b42557b583dde97ffd77ffac86..bc89f2280688fd6cc82f749fa193932aa81fe091 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.12 1997/11/17 16:59:34 momjian Exp $
+ * $Id: indexing.h,v 1.13 1998/01/11 21:03:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,8 +33,8 @@
 /*
  * Names of indices on system catalogs
  */
-#define AttributeNameIndex "pg_attribute_mkoidname_index"
-#define AttributeNumIndex  "pg_attribute_mkoidint2_index"
+#define AttributeNameIndex "pg_attribute_relid_attnam_index"
+#define AttributeNumIndex  "pg_attribute_relid_attnum_index"
 #define AttributeRelidIndex "pg_attribute_attrelid_index"
 #define ProcedureOidIndex  "pg_proc_oid_index"
 #define ProcedureNameIndex "pg_proc_proname_index"
@@ -100,8 +100,8 @@ extern HeapTuple ClassOidIndexScan(Relation heapRelation, Oid relId);
  * The keyword is DECLARE_INDEX every thing after that is just like in a
  * normal specification of the 'define index' POSTQUEL command.
  */
-DECLARE_INDEX(pg_attribute_mkoidname_index on pg_attribute using btree(mkoidname(attrelid, attname) oidname_ops));
-DECLARE_INDEX(pg_attribute_mkoidint2_index on pg_attribute using btree(mkoidint2(attrelid, attnum) oidint2_ops));
+DECLARE_INDEX(pg_attribute_relid_attnam_index on pg_attribute using btree(mkoidname(attrelid, attname) oidname_ops));
+DECLARE_INDEX(pg_attribute_relid_attnum_index on pg_attribute using btree(mkoidint2(attrelid, attnum) oidint2_ops));
 DECLARE_INDEX(pg_attribute_attrelid_index on pg_attribute using btree(attrelid oid_ops));
 
 DECLARE_INDEX(pg_proc_oid_index on pg_proc using btree(oid oid_ops));
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index c84ea249972bba4df3e1021e7d19d29a0567b32c..66e7b9290be45e9ff2f3e64cedd9d8de8e1068e3 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.11 1997/09/08 20:59:22 momjian Exp $
+ * $Id: memutils.h,v 1.12 1998/01/11 21:03:10 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -82,11 +82,16 @@ s...)
 		(((long)(LEN) + (sizeof (long) - 1)) & ~(sizeof (long) -1))
 #endif
 
+#if ! defined(sco)
 #define DOUBLEALIGN(LEN)\
 		(((long)(LEN) + (sizeof (double) - 1)) & ~(sizeof (double) -1))
 
 #define MAXALIGN(LEN)\
 		(((long)(LEN) + (sizeof (double) - 1)) & ~(sizeof (double) -1))
+#else
+#define DOUBLEALIGN(LEN) INTALIGN(LEN)
+#define MAXALIGN(LEN)    INTALIGN(LEN)
+#endif
 
 /*****************************************************************************
  *	  oset.h --			Fixed format ordered set definitions.				 *