From: "Pedro J. Lobo" <pjlobo@euitt.upm.es>

Subject: [PATCHES] Patches for compiling 6.1 on Digital Unix 3.2c

Attached to this message are the patches I needed to compile 6.1 cleanly
under Digital Unix 3.2c with DEC cc.

I hope these are the last ones. At least, the number of files needing a
patch has decreased noticeably since I sent my previous patches. Nice work
:-)

One of the patches is a bug fix, but I'm including it here anyway.

With these patches applied, the beast seems to work properly. However,
I've done only some preliminary tests. More on this later (but hopefully
before the April 30 deadline... :-)

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 7887aff3f1cdc5697637c77d547fdd7b9e729bcb..c3bb07933948fb4b0ae53b100d56827ae2b25233 100644 (file)
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.6 1997/04/15 17:39:17 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.7 1997/04/24 20:30:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 
 #include "postgres.h"
 #ifdef USE_LOCALE  
-  #include <locale.h>
+#  include <locale.h>
 #endif
 #include "miscadmin.h"
 #include "bootstrap/bootstrap.h"       /* for BootstrapMain() */

diff --git a/src/backend/utils/Gen_fmgrtab.sh.in b/src/backend/utils/Gen_fmgrtab.sh.in
index cb3ac87dd703213f4134fa87e9c7fca32fbb97a6..807862a127bca14c83333368bc846974988ed226 100644 (file)
--- a/src/backend/utils/Gen_fmgrtab.sh.in
+++ b/src/backend/utils/Gen_fmgrtab.sh.in
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.2 1997/04/09 08:55:32 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.3 1997/04/24 20:30:16 scrappy Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh.in,v 1.2 1997/04/09 08:55:32 scrappy Exp $
+ * $Id: Gen_fmgrtab.sh.in,v 1.3 1997/04/24 20:30:16 scrappy Exp $
  *
  * NOTES
  *     ******************************
@@ -152,7 +152,7 @@ extern void load_file(char *filename);
 
 FuNkYfMgRsTuFf
 awk '{ print $2, $1; }' $RAWFILE | \
-@tr@ '[a-z]' '[A-Z]' | \
+@TR@ '[a-z]' '[A-Z]' | \
 sed -e 's/^/#define F_/' >> $HFILE
 cat >> $HFILE <<FuNkYfMgRsTuFf
 
@@ -175,7 +175,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.2 1997/04/09 08:55:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.3 1997/04/24 20:30:16 scrappy Exp $
  *
  * NOTES
  *

diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index 05d79cbe1c3818b63db0300b134f60811615df34..b6f2d0988c4ba375e96d5614bd664ae2dc3dcb14 100644 (file)
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -9,7 +9,7 @@
  * workings can be found in the book "Software Solutions in C" by
  * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
  * 
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.5 1997/04/18 02:55:54 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.6 1997/04/24 20:30:41 scrappy Exp $
  */
 
 #include <stdio.h>
@@ -60,7 +60,7 @@ cash_in(const char *str)
     char dsymbol, ssymbol, psymbol, nsymbol, csymbol;
 
 #ifdef USE_LOCALE
-    if (lconv == NULL) *lconv = localeconv();
+    if (lconv == NULL) lconv = localeconv();
 
     /* frac_digits in the C locale seems to return CHAR_MAX */
     /* best guess is 2 in this case I think */
@@ -158,7 +158,7 @@ cash_out(Cash *value)
     char convention;
 
 #ifdef USE_LOCALE
-    if (lconv == NULL) *lconv = localeconv();
+    if (lconv == NULL) lconv = localeconv();
 
     mon_group = *lconv->mon_grouping;
     comma = *lconv->mon_thousands_sep;