aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/adt/float.c12
-rw-r--r--src/backend/utils/adt/nabstime.c3
2 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 310c839fa28..4af04cbb0e5 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.7 1996/11/06 06:49:48 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.8 1997/01/06 00:20:11 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -69,16 +69,18 @@ extern double atof(const char *p);
#endif
#ifdef NEED_CBRT
-#define cbrt my_cbrt
-static double cbrt(double x);
+# define cbrt my_cbrt
+ static double cbrt(double x);
#else /* NEED_CBRT */
-extern double cbrt(double x);
+# if !defined(next)
+ extern double cbrt(double x);
+# endif
#endif /* NEED_CBRT */
#ifdef NEED_RINT
#define rint my_rint
static double rint(double x);
-#else /* NEED_RINT */
+else /* NEED_RINT */
extern double rint(double x);
#endif /* NEED_RINT */
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 9f6be38e8e1..d1a2e789bd1 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.9 1996/12/16 03:34:52 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.10 1997/01/06 00:20:13 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,6 @@
#include <sys/timeb.h>
#include "postgres.h"
#include "access/xact.h"
-#include "utils/palloc.h"
#define MAXDATEFIELDS 25