diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-10-22 13:51:07 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-10-22 13:51:07 +0000 |
| commit | ca2995be7bf63e394d3ac80327cf5f69a1474745 (patch) | |
| tree | e22851ebab6a41664f9c452b439b7c397b2b5458 /src/include/parser | |
| parent | 9ac0c1e371a9fffda489a358e39130baf8e657aa (diff) | |
Remove duplicate CIDR funcs by using coerce entries.
Diffstat (limited to 'src/include/parser')
| -rw-r--r-- | src/include/parser/parse_coerce.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 8820a3e3c31..49c79d215c0 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.6 1998/10/08 18:30:36 momjian Exp $ + * $Id: parse_coerce.h,v 1.7 1998/10/22 13:51:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ typedef enum CATEGORY DATETIME_TYPE, TIMESPAN_TYPE, GEOMETRIC_TYPE, + NETWORK_TYPE, USER_TYPE, MIXED_TYPE } CATEGORY; @@ -56,7 +57,9 @@ typedef enum CATEGORY || ((t) == BOXOID) \ || ((t) == PATHOID) \ || ((t) == POLYGONOID) \ - || ((t) == CIRCLEOID)) + || ((t) == CIRCLEOID) \ + || ((t) == INETOID) \ + || ((t) == CIDROID) ) /* IS_BINARY_COMPATIBLE() @@ -83,7 +86,9 @@ typedef enum CATEGORY || ((a) == INT4OID && (b) == ABSTIMEOID) \ || ((a) == INT4OID && (b) == TIMESTAMPOID) \ || ((a) == RELTIMEOID && (b) == INT4OID) \ - || ((a) == INT4OID && (b) == RELTIMEOID)) + || ((a) == INT4OID && (b) == RELTIMEOID) \ + || ((a) == INETOID && (b) == CIDROID) \ + || ((a) == CIDROID && (b) == INETOID)) /* IS_HIGHER_TYPE() * These types are the most general in each of the type categories. @@ -93,7 +98,8 @@ typedef enum CATEGORY || ((t) == FLOAT8OID) \ || ((t) == TIMESPANOID) \ || ((t) == DATETIMEOID) \ - || ((t) == POLYGONOID)) + || ((t) == POLYGONOID) \ + || ((t) == INETOID) ) /* IS_HIGHEST_TYPE() * These types are the most general in each of the type categories. |