diff --git a/libguac/Makefile.am b/libguac/Makefile.am index 1eccf165..7db1ad03 100644 --- a/libguac/Makefile.am +++ b/libguac/Makefile.am @@ -40,11 +40,11 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = -Werror -Wall -pedantic -Iinclude libguacincdir = $(includedir)/guacamole -libguacinc_HEADERS = include/client.h include/guacio.h include/protocol.h include/client-handlers.h include/log.h include/thread.h include/error.h +libguacinc_HEADERS = include/client.h include/guacio.h include/protocol.h include/client-handlers.h include/log.h include/error.h lib_LTLIBRARIES = libguac.la -libguac_la_SOURCES = src/client.c src/guacio.c src/protocol.c src/client-handlers.c src/log.c src/thread.c src/error.c +libguac_la_SOURCES = src/client.c src/guacio.c src/protocol.c src/client-handlers.c src/log.c src/error.c libguac_la_LDFLAGS = -version-info 2:0:0 diff --git a/libguac/include/thread.h b/libguac/include/thread.h deleted file mode 100644 index f39c5682..00000000 --- a/libguac/include/thread.h +++ /dev/null @@ -1,63 +0,0 @@ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is libguac. - * - * The Initial Developer of the Original Code is - * Michael Jumper. - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef _GUAC_THREAD_H -#define _GUAC_THREAD_H - -/** - * Provides basic cross-platform threads. - * - * @file thread.h - */ - -#ifdef HAVE_LIBPTHREAD - -#include -typedef pthread_t guac_thread; - -#elif defined(__MINGW32__) - -#include -#include -typedef HANDLE guac_thread; - -#endif - -int guac_thread_create(guac_thread* thread, void*(*function)(void*), void* data); -void guac_thread_join(guac_thread thread); - -#endif diff --git a/libguac/src/client.c b/libguac/src/client.c index 5d27c0eb..572e62b5 100644 --- a/libguac/src/client.c +++ b/libguac/src/client.c @@ -40,7 +40,6 @@ #include #include -#include "thread.h" #include "log.h" #include "guacio.h" #include "protocol.h" diff --git a/libguac/src/thread.c b/libguac/src/thread.c deleted file mode 100644 index ffa8a647..00000000 --- a/libguac/src/thread.c +++ /dev/null @@ -1,67 +0,0 @@ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is libguac. - * - * The Initial Developer of the Original Code is - * Michael Jumper. - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "thread.h" - -#ifdef HAVE_LIBPTHREAD -#include -#elif defined(__MINGW32__) -#include -#include -#endif - -int guac_thread_create(guac_thread* thread, void*(*function)(void*), void* data) { -#ifdef HAVE_LIBPTHREAD - return pthread_create(thread, NULL, function, data); -#elif defined(__MINGW32__) - *thread = (guac_thread) _beginthreadex(NULL, 0, - (unsigned(__stdcall*)(void*)) function, data, - 0 /* Create running */, NULL); - if (thread == 0) - return errno; - return 0; -#endif -} - -void guac_thread_join(guac_thread thread) { -#ifdef HAVE_LIBPTHREAD - pthread_join(thread, NULL); -#elif defined(__MINGW32__) - WaitForSingleObject(thread, INFINITE); -#endif -} -