diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2023-10-26 14:05:36 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2023-10-26 14:58:44 +0300 |
| commit | 4f504885ab6f95bc35471124d1b0107ab0095090 (patch) | |
| tree | 4f183044d4f4d3834fe7e36f1da23613b70aed42 | |
| parent | 11864378c1db4609db90c75576ea33f9b0052c11 (diff) | |
| download | ydb-4f504885ab6f95bc35471124d1b0107ab0095090.tar.gz | |
Prevent contrib/libs/postgresql from depending on contrib/libs/libpq
| -rw-r--r-- | build/sysincl/misc-win.yml | 1 | ||||
| -rw-r--r-- | contrib/libs/postgresql/src/include/port/darwin.h (renamed from contrib/libs/libpq/src/include/port/darwin.h) | 0 | ||||
| -rw-r--r-- | contrib/libs/postgresql/src/include/port/linux.h (renamed from contrib/libs/libpq/src/include/port/linux.h) | 0 | ||||
| -rw-r--r-- | contrib/libs/postgresql/src/include/port/win32.h (renamed from contrib/libs/libpq/src/include/port/win32.h) | 1 | ||||
| -rw-r--r-- | ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-linux.h | 2 | ||||
| -rw-r--r-- | ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-osx.h | 2 | ||||
| -rw-r--r-- | ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-win.h | 2 |
7 files changed, 4 insertions, 4 deletions
diff --git a/build/sysincl/misc-win.yml b/build/sysincl/misc-win.yml index 6814f85dcf..7fc31b1c70 100644 --- a/build/sysincl/misc-win.yml +++ b/build/sysincl/misc-win.yml @@ -23,6 +23,7 @@ includes: - arpa/inet.h: contrib/libs/postgresql/src/include/port/win32/arpa/inet.h - dirent.h: contrib/libs/postgresql/src/include/port/win32_msvc/dirent.h + - dlfcn.h: contrib/libs/postgresql/src/include/port/win32/dlfcn.h - grp.h: contrib/libs/postgresql/src/include/port/win32/grp.h - netdb.h: contrib/libs/postgresql/src/include/port/win32/netdb.h - netinet/in.h: contrib/libs/postgresql/src/include/port/win32/netinet/in.h diff --git a/contrib/libs/libpq/src/include/port/darwin.h b/contrib/libs/postgresql/src/include/port/darwin.h index 15fb69d6db..15fb69d6db 100644 --- a/contrib/libs/libpq/src/include/port/darwin.h +++ b/contrib/libs/postgresql/src/include/port/darwin.h diff --git a/contrib/libs/libpq/src/include/port/linux.h b/contrib/libs/postgresql/src/include/port/linux.h index 7a6e46cdbb..7a6e46cdbb 100644 --- a/contrib/libs/libpq/src/include/port/linux.h +++ b/contrib/libs/postgresql/src/include/port/linux.h diff --git a/contrib/libs/libpq/src/include/port/win32.h b/contrib/libs/postgresql/src/include/port/win32.h index 115708f2ea..c6213c77c3 100644 --- a/contrib/libs/libpq/src/include/port/win32.h +++ b/contrib/libs/postgresql/src/include/port/win32.h @@ -1,5 +1,4 @@ /* src/include/port/win32.h */ -#pragma once /* * We always rely on the WIN32 macro being set by our build system, diff --git a/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-linux.h b/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-linux.h index 331e1b2cf1..082f335fcc 100644 --- a/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-linux.h +++ b/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-linux.h @@ -1 +1 @@ -#include <contrib/libs/libpq/src/include/port/linux.h> +#include <contrib/libs/postgresql/src/include/port/linux.h> diff --git a/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-osx.h b/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-osx.h index f77fb9d4da..e1860f89f8 100644 --- a/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-osx.h +++ b/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-osx.h @@ -1 +1 @@ -#include <contrib/libs/libpq/src/include/port/darwin.h> +#include <contrib/libs/postgresql/src/include/port/darwin.h> diff --git a/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-win.h b/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-win.h index e26ba92209..7103ebb79b 100644 --- a/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-win.h +++ b/ydb/library/yql/parser/pg_wrapper/postgresql/src/include/pg_config_os-win.h @@ -1 +1 @@ -#include <contrib/libs/libpq/src/include/port/win32.h> +#include <contrib/libs/postgresql/src/include/port/win32.h> |