4 files changed, 30 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 040695c..633a2ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1998-08-11  Ben Elliston  <bje@cygnus.com>
+
+	* Makefile (LIB): Define.
+	(clean): Define target.
+	(all): Build a library not just the object files.
+
+	* pthread.h: Provide a definition for struct timespec if we don't
+	already have one.
+
+	* windows.c (TlsGetValue): Bug fix.
+	
 Thu Aug  6 15:19:22 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
 
 	* misc.c (pthread_once): Fix arg 1 of EnterCriticalSection()
diff --git a/Makefile b/Makefile
index de64ae1..d67612a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,16 @@ CFLAGS	= -I. -DHAVE_CONFIG_H -Wall
 
 OBJS	= attr.o cancel.o cleanup.o condvar.o create.o dll.o \
 	  exit.o fork.o global.o misc.o mutex.o private.o sched.o \
-	  signal.o sync.o tsd.o
+	  signal.o sync.o tsd.o windows.o
 
 INCL	= implement.h pthread.h windows.h
 
-all:	$(OBJS)
+LIB	= libpthread32.a
+
+all:	$(LIB)
+
+$(LIB):	$(OBJS)
+	$(AR) r $(LIB) $(OBJS)
+
+clean:
+	-rm $(LIB) *.o
diff --git a/pthread.h b/pthread.h
index dc085c3..fe4b30f 100644
--- a/pthread.h
+++ b/pthread.h
@@ -40,6 +40,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <signal.h>
 #endif /* HAVE_SIGNAL_H */
 
+#ifndef HAVE_STRUCT_TIMESPEC
+struct timespec {
+	int tv_sec;
+	int tv_nsec;
+};
+#endif /* HAVE_STRUCT_TIMESPEC */
+
 #ifndef SIG_BLOCK
 #define SIG_BLOCK 0
 #endif /* SIG_BLOCK */
diff --git a/windows.c b/windows.c
index 2549f33..d55a9d7 100644
--- a/windows.c
+++ b/windows.c
@@ -98,10 +98,10 @@ BOOL TlsSetValue(DWORD index, LPVOID value)
 	return TRUE;
 }
 
-BOOL TlsGetValue(DWORD index, LPVOID value)
+LPVOID TlsGetValue(DWORD index)
 {
 	DIAG("TlsGetValue");
-	return TRUE;
+	return 0;
 }
 
 BOOL SetThreadPriority(HANDLE threadHandle, int priority)