From 39635122a5c736a77abc6253c24aaa466ad2b969 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@xiph.org>
Date: Tue, 5 Mar 2002 23:59:38 +0000
Subject: [PATCH] win32 patches from Ed

svn path=/trunk/icecast/; revision=3123
---
 src/logging.h       | 2 +-
 src/thread/thread.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/logging.h b/src/logging.h
index 475b5cd3..34ce11aa 100644
--- a/src/logging.h
+++ b/src/logging.h
@@ -14,7 +14,7 @@ extern int accesslog;
 */
 
 #ifdef _WIN32
-#define __FUNCTION__ __FILE__ ":" __LINE__
+#define __FUNCTION__ __FILE__
 #endif
 
 #define ERROR0(y) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y)
diff --git a/src/thread/thread.c b/src/thread/thread.c
index 1e420bf9..698e6c53 100644
--- a/src/thread/thread.c
+++ b/src/thread/thread.c
@@ -25,16 +25,17 @@
 #include <time.h>
 #include <sys/types.h>
 
+#include <pthread.h>
+
 #ifndef _WIN32
 #include <unistd.h>
 #include <sys/time.h>
 #else
 #include <windows.h>
 #include <winbase.h>
+#include <implement.h>
 #endif
 
-#include <pthread.h>
-
 #include <signal.h>
 
 #include "log.h"
@@ -42,7 +43,7 @@
 #include "avl.h"
 
 #ifdef _WIN32
-#define __FUNCTION__ __FILE__ ":" __LINE__
+#define __FUNCTION__ __FILE__
 #endif
 
 #define CATMODULE "thread"