diff options
Diffstat (limited to 'libpq/libpq')
| -rw-r--r-- | libpq/libpq/buildfile | 12 | ||||
| -rw-r--r-- | libpq/libpq/pg_config.h | 8 | ||||
| -rw-r--r-- | libpq/libpq/pg_config_ext.h | 1 | ||||
| -rw-r--r-- | libpq/libpq/pg_config_os.h | 1 | ||||
| -rw-r--r-- | libpq/libpq/pg_config_paths.h | 1 | ||||
| -rw-r--r-- | libpq/libpq/version.h.in | 1 |
6 files changed, 12 insertions, 12 deletions
diff --git a/libpq/libpq/buildfile b/libpq/libpq/buildfile index d77ccf7..bf7f844 100644 --- a/libpq/libpq/buildfile +++ b/libpq/libpq/buildfile @@ -1,6 +1,5 @@ # file : libpq/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd -# license : PostgreSQL Licenes; see accompanying COPYRIGHT file +# license : PostgreSQL Licene; see accompanying COPYRIGHT file import imp_libs = libssl%lib{ssl} import imp_libs += libcrypto%lib{crypto} @@ -19,18 +18,19 @@ lib{pq}: {h }{* -version} \ common/{ c}{* } \ include/{h }{** } \ {def }{libpqdll } \ - {file}{libpqdll.map } \ pq/{file}{pg_service.conf.sample } \ $imp_libs tclass = $c.target.class tsys = $c.target.system +linux = ($tclass == 'linux') bsd = ($tclass == 'bsd') macos = ($tclass == 'macos') windows = ($tclass == 'windows') -lib{pq}: port/c{strlcpy}: include = (!$bsd && !$macos) +lib{pq}: file{libpqdll.map}: include = ($linux || $bsd ? adhoc : false) +lib{pq}: port/c{strlcpy}: include = (!$bsd && !$macos) lib{pq}: pq/{h c}{*win32* } \ port/{h c}{*win32* +getaddrinfo +inet_aton}: include = $windows @@ -49,8 +49,8 @@ h{version}: in{version} $src_root/manifest c.poptions += -DFRONTEND -DUNSAFE_STAT_OK -DSO_MAJOR_VERSION=$abi_major if! $windows - # Note that the upstream package uses -pthread compiler/linker option. It is - # currently unsupported by build2, so we use -D_REENTRANT and -lpthread + # Note that the upstream package uses the -pthread compiler/linker option. + # The option is unsupported by build2 so we pass -D_REENTRANT and -lpthread # preprocessor/linker options instead. We also omit -D_THREAD_SAFE (synonym # for -D_REENTRANT) and Solaris-specific -D_POSIX_PTHREAD_SEMANTICS. # diff --git a/libpq/libpq/pg_config.h b/libpq/libpq/pg_config.h index 12d418e..fcea042 100644 --- a/libpq/libpq/pg_config.h +++ b/libpq/libpq/pg_config.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ @@ -189,6 +188,7 @@ # define HAVE_DLOPEN 1 # define HAVE_PREAD 1 # define HAVE_PWRITE 1 + /* * Specific for Windows. */ @@ -197,10 +197,14 @@ # define HAVE_DECL_RTLD_GLOBAL 0 # define HAVE_DECL_RTLD_NOW 0 # define HAVE_DECL_POSIX_FADVISE 0 -# define HAVE_GETTIMEOFDAY 1 # define HAVE_ISINF 1 # define HAVE_FUNCNAME__FUNCTION 1 # define USE_REPL_SNPRINTF 1 + +/* + * This is not a mistake, the macro is defined opposite to the norm. + */ +# define HAVE_GETTIMEOFDAY 1 #endif /* diff --git a/libpq/libpq/pg_config_ext.h b/libpq/libpq/pg_config_ext.h index e3a9abe..22ec6d9 100644 --- a/libpq/libpq/pg_config_ext.h +++ b/libpq/libpq/pg_config_ext.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config_ext.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/libpq/pg_config_os.h b/libpq/libpq/pg_config_os.h index e616265..c3299fe 100644 --- a/libpq/libpq/pg_config_os.h +++ b/libpq/libpq/pg_config_os.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config_os.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/libpq/pg_config_paths.h b/libpq/libpq/pg_config_paths.h index 2e67511..7c10791 100644 --- a/libpq/libpq/pg_config_paths.h +++ b/libpq/libpq/pg_config_paths.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config_paths.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/libpq/version.h.in b/libpq/libpq/version.h.in index 0dec491..0a4b4ee 100644 --- a/libpq/libpq/version.h.in +++ b/libpq/libpq/version.h.in @@ -1,5 +1,4 @@ /* file : libpq/version.h.in -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ |