summaryrefslogtreecommitdiff
path: root/src/include/port/win32/sys
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-05-19 17:31:59 +0000
committerBruce Momjian <bruce@momjian.us>2003-05-19 17:31:59 +0000
commit36adb2e0955523c402037e601d848e4206f2ee34 (patch)
tree0f413481955022fa1cde0aadcd31deedb7abaaca /src/include/port/win32/sys
parent08d7e1c20edebf1ff02aad20430a43fcea3422e0 (diff)
Rename Win32 include directory from win32_include to win32.
Diffstat (limited to 'src/include/port/win32/sys')
-rw-r--r--src/include/port/win32/sys/socket.h15
-rw-r--r--src/include/port/win32/sys/wait.h0
2 files changed, 15 insertions, 0 deletions
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, <wingdi.h> of VC++ also defines ERROR.
+ * To avoid the conflict, we include <windows.h> here and undefine ERROR
+ * immediately.
+ *
+ * Note: Don't include <wingdi.h> directly. It causes compile errors.
+ */
+#include <winsock2.h>
+#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
--- /dev/null
+++ b/src/include/port/win32/sys/wait.h