Browse Source

Prevent contrib/libs/postgresql from depending on contrib/libs/libpq

thegeorg 1 year ago
parent
commit
4f504885ab

+ 1 - 0
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

+ 0 - 0
contrib/libs/libpq/src/include/port/darwin.h → contrib/libs/postgresql/src/include/port/darwin.h


+ 0 - 0
contrib/libs/libpq/src/include/port/linux.h → contrib/libs/postgresql/src/include/port/linux.h


+ 0 - 1
contrib/libs/libpq/src/include/port/win32.h → 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,

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>