提交 103cf756 编写于 作者: B Bruce Momjian

Re-apply range check patch after fixing LIMIT_H test and defines.

上级 cd5dfb65
...@@ -36,6 +36,7 @@ PARSER ...@@ -36,6 +36,7 @@ PARSER
* UNION with LIMIT fails * UNION with LIMIT fails
* Unique index on base column not honored on inserts from inherited table * Unique index on base column not honored on inserts from inherited table
INSERT INTO inherit_table (unique_index_col) VALUES (dup) should fail INSERT INTO inherit_table (unique_index_col) VALUES (dup) should fail
* CREATE TABLE x AS SELECT 1 UNION SELECT 2 fails
VIEWS VIEWS
...@@ -175,6 +176,7 @@ MISC ...@@ -175,6 +176,7 @@ MISC
* Add PL/Perl(Mark Hollomon) * Add PL/Perl(Mark Hollomon)
* Make postgres user have a password by default * Make postgres user have a password by default
* Add configure test to check for C++ need for *.h and namespaces * Add configure test to check for C++ need for *.h and namespaces
* Allow BLCKSZ <= 64k, not <= 32k
PERFORMANCE PERFORMANCE
----------- -----------
......
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.32 1999/07/09 03:27:20 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.33 1999/07/09 17:40:31 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h> /* for sprintf() */ #include <stdio.h> /* for sprintf() */
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#ifdef HAVE_LIMITS #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif
#include "postgres.h" #include "postgres.h"
...@@ -32,19 +32,19 @@ ...@@ -32,19 +32,19 @@
#define INT_MAX (0x7FFFFFFFL) #define INT_MAX (0x7FFFFFFFL)
#endif #endif
#ifndef INT_MIN #ifndef INT_MIN
#define INT_MIN (-0x80000000L) #define INT_MIN (-INT_MAX-1)
#endif #endif
#ifndef SHRT_MAX #ifndef SHRT_MAX
#define SHRT_MAX (0x7FFF) #define SHRT_MAX (0x7FFF)
#endif #endif
#ifndef SHRT_MIN #ifndef SHRT_MIN
#define SHRT_MIN (-0x8000) #define SHRT_MIN (-SHRT_MAX-1)
#endif #endif
#ifndef SCHAR_MAX #ifndef SCHAR_MAX
#define SCHAR_MAX (0x7F) #define SCHAR_MAX (0x7F)
#endif #endif
#ifndef SCHAR_MIN #ifndef SCHAR_MIN
#define SCHAR_MIN (-0x80) #define SCHAR_MIN (-SCHAR_MAX-1)
#endif #endif
int32 int32
...@@ -76,7 +76,7 @@ pg_atoi(char *s, int size, int c) ...@@ -76,7 +76,7 @@ pg_atoi(char *s, int size, int c)
switch (size) switch (size)
{ {
case sizeof(int32): case sizeof(int32):
#ifdef HAS_LONG_LONG #if defined(HAVE_LONG_INT_64) || defined(HAVE_LONG_LONG_INT_64)
/* won't get ERANGE on these with 64-bit longs... */ /* won't get ERANGE on these with 64-bit longs... */
if (l < INT_MIN) if (l < INT_MIN)
{ {
...@@ -88,7 +88,7 @@ pg_atoi(char *s, int size, int c) ...@@ -88,7 +88,7 @@ pg_atoi(char *s, int size, int c)
errno = ERANGE; errno = ERANGE;
elog(ERROR, "pg_atoi: error reading \"%s\": %m", s); elog(ERROR, "pg_atoi: error reading \"%s\": %m", s);
} }
#endif /* HAS_LONG_LONG */ #endif /* HAVE_LONG_INT_64 or HAVE_LONG_LONG_INT_64 */
break; break;
case sizeof(int16): case sizeof(int16):
if (l < SHRT_MIN) if (l < SHRT_MIN)
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define FALSE ((BOOL)0) #define FALSE ((BOOL)0)
#endif #endif
#if HAVE_PARAM_H #if HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#else #else
#define MAXPATHLEN 255 #define MAXPATHLEN 255
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册