From 36adb2e0955523c402037e601d848e4206f2ee34 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 19 May 2003 17:31:59 +0000 Subject: Rename Win32 include directory from win32_include to win32. --- src/include/port/win32/arpa/inet.h | 1 + src/include/port/win32/dlfcn.h | 0 src/include/port/win32/grp.h | 0 src/include/port/win32/netdb.h | 0 src/include/port/win32/netinet/in.h | 2 ++ src/include/port/win32/pwd.h | 0 src/include/port/win32/sys/socket.h | 15 +++++++++++++++ src/include/port/win32/sys/wait.h | 0 src/include/port/win32_include/arpa/inet.h | 1 - src/include/port/win32_include/dlfcn.h | 0 src/include/port/win32_include/grp.h | 0 src/include/port/win32_include/netdb.h | 0 src/include/port/win32_include/netinet/in.h | 2 -- src/include/port/win32_include/pwd.h | 0 src/include/port/win32_include/sys/socket.h | 15 --------------- src/include/port/win32_include/sys/wait.h | 0 src/makefiles/Makefile.win32 | 4 ++-- 17 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 src/include/port/win32/arpa/inet.h create mode 100644 src/include/port/win32/dlfcn.h create mode 100644 src/include/port/win32/grp.h create mode 100644 src/include/port/win32/netdb.h create mode 100644 src/include/port/win32/netinet/in.h create mode 100644 src/include/port/win32/pwd.h create mode 100644 src/include/port/win32/sys/socket.h create mode 100644 src/include/port/win32/sys/wait.h delete mode 100644 src/include/port/win32_include/arpa/inet.h delete mode 100644 src/include/port/win32_include/dlfcn.h delete mode 100644 src/include/port/win32_include/grp.h delete mode 100644 src/include/port/win32_include/netdb.h delete mode 100644 src/include/port/win32_include/netinet/in.h delete mode 100644 src/include/port/win32_include/pwd.h delete mode 100644 src/include/port/win32_include/sys/socket.h delete mode 100644 src/include/port/win32_include/sys/wait.h (limited to 'src') diff --git a/src/include/port/win32/arpa/inet.h b/src/include/port/win32/arpa/inet.h new file mode 100644 index 00000000000..dc979c05372 --- /dev/null +++ b/src/include/port/win32/arpa/inet.h @@ -0,0 +1 @@ +#include diff --git a/src/include/port/win32/dlfcn.h b/src/include/port/win32/dlfcn.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/include/port/win32/grp.h b/src/include/port/win32/grp.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/include/port/win32/netdb.h b/src/include/port/win32/netdb.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/include/port/win32/netinet/in.h b/src/include/port/win32/netinet/in.h new file mode 100644 index 00000000000..52db5248cb7 --- /dev/null +++ b/src/include/port/win32/netinet/in.h @@ -0,0 +1,2 @@ +#include + diff --git a/src/include/port/win32/pwd.h b/src/include/port/win32/pwd.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/include/port/win32/sys/socket.h b/src/include/port/win32/sys/socket.h new file mode 100644 index 00000000000..93df14ed7ce --- /dev/null +++ b/src/include/port/win32/sys/socket.h @@ -0,0 +1,15 @@ +/* + * Unfortunately, of VC++ also defines ERROR. + * To avoid the conflict, we include here and undefine ERROR + * immediately. + * + * Note: Don't include directly. It causes compile errors. + */ +#include +#undef ERROR +#undef small + +/* Restore old ERROR value */ +#ifdef PGERROR +#define ERROR PGERROR +#endif diff --git a/src/include/port/win32/sys/wait.h b/src/include/port/win32/sys/wait.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/include/port/win32_include/arpa/inet.h b/src/include/port/win32_include/arpa/inet.h deleted file mode 100644 index dc979c05372..00000000000 --- a/src/include/port/win32_include/arpa/inet.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/src/include/port/win32_include/dlfcn.h b/src/include/port/win32_include/dlfcn.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/include/port/win32_include/grp.h b/src/include/port/win32_include/grp.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/include/port/win32_include/netdb.h b/src/include/port/win32_include/netdb.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/include/port/win32_include/netinet/in.h b/src/include/port/win32_include/netinet/in.h deleted file mode 100644 index 52db5248cb7..00000000000 --- a/src/include/port/win32_include/netinet/in.h +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/src/include/port/win32_include/pwd.h b/src/include/port/win32_include/pwd.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/include/port/win32_include/sys/socket.h b/src/include/port/win32_include/sys/socket.h deleted file mode 100644 index 93df14ed7ce..00000000000 --- a/src/include/port/win32_include/sys/socket.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Unfortunately, of VC++ also defines ERROR. - * To avoid the conflict, we include here and undefine ERROR - * immediately. - * - * Note: Don't include directly. It causes compile errors. - */ -#include -#undef ERROR -#undef small - -/* Restore old ERROR value */ -#ifdef PGERROR -#define ERROR PGERROR -#endif diff --git a/src/include/port/win32_include/sys/wait.h b/src/include/port/win32_include/sys/wait.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index 0fb52b97fee..b6f178f4a4b 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -1,7 +1,7 @@ -# $Header: /cvsroot/pgsql/src/makefiles/Makefile.win32,v 1.1 2003/05/15 16:35:30 momjian Exp $ +# $Header: /cvsroot/pgsql/src/makefiles/Makefile.win32,v 1.2 2003/05/19 17:31:59 momjian Exp $ # Use replacement include files for those missing on Win32 -override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32_include" +override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32" DLLTOOL= dlltool DLLWRAP= dllwrap -- cgit v1.2.3