diff options
| author | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
| commit | 73fa25c67cbfa24c03e28c96bf356f2592671730 (patch) | |
| tree | 10ded7e26abd78d93658cb72fc5cb9d4672eff2a /src/include/getaddrinfo.h | |
| parent | da4d108859bcd7a308ca75aba54281e32968822c (diff) | |
| parent | 4a9ab6d8619817f9e3989c99b65140e19041dab7 (diff) | |
Merge branch 'XL_MASTER_MERGE_9_4' into XL_NEW_MASTER
Conflicts:
src/test/regress/expected/aggregates.out
src/test/regress/expected/create_index.out
src/test/regress/expected/inherit.out
src/test/regress/expected/join.out
src/test/regress/expected/window.out
src/test/regress/expected/with.out
Diffstat (limited to 'src/include/getaddrinfo.h')
| -rw-r--r-- | src/include/getaddrinfo.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index 519a97975e..7995235d9f 100644 --- a/src/include/getaddrinfo.h +++ b/src/include/getaddrinfo.h @@ -13,7 +13,7 @@ * This code will also work on platforms where struct addrinfo is defined * in the system headers but no getaddrinfo() can be located. * - * Copyright (c) 2003-2012, PostgreSQL Global Development Group + * Copyright (c) 2003-2014, PostgreSQL Global Development Group * * src/include/getaddrinfo.h * @@ -82,6 +82,9 @@ #ifndef NI_NUMERICSERV #define NI_NUMERICSERV 2 #endif +#ifndef NI_NAMEREQD +#define NI_NAMEREQD 4 +#endif #ifndef NI_MAXHOST #define NI_MAXHOST 1025 |