winpthreads: remove ref.c and ref.h Internal header file ref.h does not declare any functions. Likewise, ref.c does not define any functions. Signed-off-by: Kirill Makurin <maiddaisuki@outlook.com> Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/mingw-w64-libraries/winpthreads/Makefile.am b/mingw-w64-libraries/winpthreads/Makefile.am index 8fbdda9..0bcff1a 100644 --- a/mingw-w64-libraries/winpthreads/Makefile.am +++ b/mingw-w64-libraries/winpthreads/Makefile.am
@@ -22,7 +22,6 @@ src/misc.c src/misc.h \ src/mutex.c \ src/nanosleep.c \ - src/ref.c src/ref.h \ src/rwlock.c src/rwlock.h \ src/sem.c src/sem.h \ src/spinlock.c \
diff --git a/mingw-w64-libraries/winpthreads/src/barrier.c b/mingw-w64-libraries/winpthreads/src/barrier.c index f3b5c46..13e38a2 100644 --- a/mingw-w64-libraries/winpthreads/src/barrier.c +++ b/mingw-w64-libraries/winpthreads/src/barrier.c
@@ -25,8 +25,8 @@ #include <stdio.h> #include <malloc.h> #include "pthread.h" +#include "semaphore.h" #include "barrier.h" -#include "ref.h" #include "misc.h" static pthread_spinlock_t barrier_global = PTHREAD_SPINLOCK_INITIALIZER;
diff --git a/mingw-w64-libraries/winpthreads/src/cond.c b/mingw-w64-libraries/winpthreads/src/cond.c index b0ff65b..ea49255 100644 --- a/mingw-w64-libraries/winpthreads/src/cond.c +++ b/mingw-w64-libraries/winpthreads/src/cond.c
@@ -30,7 +30,6 @@ #include <time.h> #include "pthread.h" #include "pthread_time.h" -#include "ref.h" #include "cond.h" #include "thread.h" #include "misc.h"
diff --git a/mingw-w64-libraries/winpthreads/src/ref.c b/mingw-w64-libraries/winpthreads/src/ref.c deleted file mode 100644 index 0344d45..0000000 --- a/mingw-w64-libraries/winpthreads/src/ref.c +++ /dev/null
@@ -1,34 +0,0 @@ -/* - Copyright (c) 2011-2016 mingw-w64 project - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#include <windows.h> -#include <winternl.h> -#include <stdio.h> -#include "pthread.h" -#include "semaphore.h" -#include "rwlock.h" -#include "cond.h" -#include "barrier.h" -#include "sem.h" -#include "ref.h" -#include "misc.h" -
diff --git a/mingw-w64-libraries/winpthreads/src/ref.h b/mingw-w64-libraries/winpthreads/src/ref.h deleted file mode 100644 index 5ca6750..0000000 --- a/mingw-w64-libraries/winpthreads/src/ref.h +++ /dev/null
@@ -1,29 +0,0 @@ -/* - Copyright (c) 2011-2016 mingw-w64 project - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#ifndef WIN_PTHREADS_REF_H -#define WIN_PTHREADS_REF_H -#include "pthread.h" -#include "semaphore.h" - -#endif -
diff --git a/mingw-w64-libraries/winpthreads/src/rwlock.c b/mingw-w64-libraries/winpthreads/src/rwlock.c index 7a4e583..0bdfe41 100644 --- a/mingw-w64-libraries/winpthreads/src/rwlock.c +++ b/mingw-w64-libraries/winpthreads/src/rwlock.c
@@ -26,7 +26,6 @@ #include <malloc.h> #include "pthread.h" #include "thread.h" -#include "ref.h" #include "rwlock.h" #include "misc.h"
diff --git a/mingw-w64-libraries/winpthreads/src/sem.c b/mingw-w64-libraries/winpthreads/src/sem.c index 340ff69..990f10c 100644 --- a/mingw-w64-libraries/winpthreads/src/sem.c +++ b/mingw-w64-libraries/winpthreads/src/sem.c
@@ -28,7 +28,6 @@ #include "misc.h" #include "semaphore.h" #include "sem.h" -#include "ref.h" int do_sema_b_wait_intern (HANDLE sema, int nointerrupt, DWORD timeout); @@ -350,5 +349,5 @@ *sval = (int) sv->value; pthread_mutex_unlock (&sv->vlock); - return 0; + return 0; }