Skip to content

GitLab

Commit 39635122 authored by Jack Moffitt's avatar Jack Moffitt
Browse files
Options

win32 patches from Ed 

svn path=/trunk/icecast/; revision=3123
parent cb9de1ee
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
src/logging.h
View file @ 39635122
...@@ -14,7 +14,7 @@ extern int accesslog; ...@@ -14,7 +14,7 @@ extern int accesslog;
*/ */
#ifdef _WIN32 #ifdef _WIN32
#define __FUNCTION__ __FILE__ ":" __LINE__ #define __FUNCTION__ __FILE__
#endif #endif
#define ERROR0(y) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y) #define ERROR0(y) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y)
......
src/thread/thread.c
View file @ 39635122
...@@ -25,16 +25,17 @@ ...@@ -25,16 +25,17 @@
#include <time.h> #include <time.h>
#include <sys/types.h> #include <sys/types.h>
#include <pthread.h>
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#else #else
#include <windows.h> #include <windows.h>
#include <winbase.h> #include <winbase.h>
#include <implement.h>
#endif #endif
#include <pthread.h>
#include <signal.h> #include <signal.h>
#include "log.h" #include "log.h"
...@@ -42,7 +43,7 @@ ...@@ -42,7 +43,7 @@
#include "avl.h" #include "avl.h"
#ifdef _WIN32 #ifdef _WIN32
#define __FUNCTION__ __FILE__ ":" __LINE__ #define __FUNCTION__ __FILE__
#endif #endif
#define CATMODULE "thread" #define CATMODULE "thread"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment