diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-10-08 04:07:11 +0200 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-10-08 04:07:11 +0200 |
| commit | 833b130f264a55befed572583ea33b04c1ed49e1 (patch) | |
| tree | 2741fdb3908d4c3f9657df1f9900b55d859be6c1 /src | |
| parent | 85eb25e961f471e88b014806f60927e7e3f5ab3c (diff) | |
| parent | c1fc5eb08fadf38b7f15157d9e3beba73215f118 (diff) | |
Merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/thread.c | 33 | ||||
| -rw-r--r-- | src/common/thread.h | 10 | ||||
| -rw-r--r-- | src/makeinc.skel | 3 |
3 files changed, 1 insertions, 45 deletions
diff --git a/src/common/thread.c b/src/common/thread.c deleted file mode 100644 index 02b17cfb..00000000 --- a/src/common/thread.c +++ /dev/null @@ -1,33 +0,0 @@ -#include <fcntl.h> -#include "thread.h" - -thread * -thread_new (void) -{ - thread *th; - - th = calloc (1, sizeof (*th)); - if (!th) - { - return NULL; - } - - if (_pipe (th->pipe_fd, 4096, _O_BINARY) == -1) - { - free (th); - return NULL; - } - - return th; -} - -int -thread_start (thread *th, void *(*start_routine)(void *), void *arg) -{ - DWORD id; - - CloseHandle (CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE)start_routine, arg, 0, (DWORD *)&id)); - th->threadid = id; - - return 1; -} diff --git a/src/common/thread.h b/src/common/thread.h deleted file mode 100644 index 7ca0f937..00000000 --- a/src/common/thread.h +++ /dev/null @@ -1,10 +0,0 @@ -#include <windows.h> - -typedef struct -{ - DWORD threadid; - int pipe_fd[2]; -} thread; - -thread *thread_new (void); -int thread_start (thread *th, void *(*start_routine)(void *), void *arg); diff --git a/src/makeinc.skel b/src/makeinc.skel index 5612d85f..8961928b 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -5,7 +5,7 @@ CFLAGS = $(CFLAGS) /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /DGDK_ CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins CPPFLAGS = /c /MD /W0 /nologo /DWIN32 LDFLAGS = /subsystem:windows /nologo -LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ws2_32.lib wininet.lib comdlg32.lib +LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ws2_32.lib wininet.lib !ifdef X64 ############################################################# @@ -77,7 +77,6 @@ server.obj \ servlist.obj \ ssl.obj \ text.obj \ -thread.obj \ tree.obj \ url.obj \ userlist.obj \ |