From 97c3fcd9b7585abd208fdae424814df47a896d73 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Mon, 10 Jul 2006 18:53:29 +0000
Subject: Move pthread-win32.h to /port, modify bcc/msvc makefiles.

---
 src/interfaces/libpq/bcc32.mak       |  2 +-
 src/interfaces/libpq/pthread-win32.h | 19 -------------------
 src/interfaces/libpq/win32.mak       |  2 +-
 src/port/pthread-win32.h             | 19 +++++++++++++++++++
 4 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 src/interfaces/libpq/pthread-win32.h
 create mode 100644 src/port/pthread-win32.h

diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index f70f157395d..f5d5eca86a1 100644
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -62,7 +62,7 @@ OUTFILENAME=blibpq
 USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
 
 CPP=bcc32.exe
-CPP_PROJ = -I$(BCB)\include;..\..\include -n"$(INTDIR)" -WD -c -D$(USERDEFINES) -tWM \
+CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\include\port\win32;..\..\include\port\win32_msvc;..\..\port -n"$(INTDIR)" -WD -c -D$(USERDEFINES) -tWM \
 		-a8 -X -w-use -w-par -w-pia -w-csu -w-aus -w-ccc
 
 !IFDEF DEBUG
diff --git a/src/interfaces/libpq/pthread-win32.h b/src/interfaces/libpq/pthread-win32.h
deleted file mode 100644
index dfcdd328ec0..00000000000
--- a/src/interfaces/libpq/pthread-win32.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __PTHREAD_H
-#define __PTHREAD_H
-
-typedef ULONG pthread_key_t;
-typedef HANDLE pthread_mutex_t;
-typedef int pthread_once_t;
-
-DWORD		pthread_self();
-
-void		pthread_setspecific(pthread_key_t, void *);
-void	   *pthread_getspecific(pthread_key_t);
-
-void		pthread_mutex_init(pthread_mutex_t *, void *attr);
-void		pthread_mutex_lock(pthread_mutex_t *);
-
-/* blocking */
-void		pthread_mutex_unlock(pthread_mutex_t *);
-
-#endif
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 48bf70af0b5..3dfff56421e 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -119,7 +119,7 @@ pg_config_paths.h: win32.mak
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I. /D "FRONTEND" $(DEBUGDEF) /D\
+CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /D "FRONTEND" $(DEBUGDEF) /D\
  "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
 
diff --git a/src/port/pthread-win32.h b/src/port/pthread-win32.h
new file mode 100644
index 00000000000..dfcdd328ec0
--- /dev/null
+++ b/src/port/pthread-win32.h
@@ -0,0 +1,19 @@
+#ifndef __PTHREAD_H
+#define __PTHREAD_H
+
+typedef ULONG pthread_key_t;
+typedef HANDLE pthread_mutex_t;
+typedef int pthread_once_t;
+
+DWORD		pthread_self();
+
+void		pthread_setspecific(pthread_key_t, void *);
+void	   *pthread_getspecific(pthread_key_t);
+
+void		pthread_mutex_init(pthread_mutex_t *, void *attr);
+void		pthread_mutex_lock(pthread_mutex_t *);
+
+/* blocking */
+void		pthread_mutex_unlock(pthread_mutex_t *);
+
+#endif
-- 
cgit v1.2.3