Skip to content

Commit 8aaa9fb

Browse files
committed
win32: rename pthread.{c,h} to thread.{c,h}
The old pthread-file did re-implement the pthreads API with exact symbol matching. As the thread-abstraction has now been split up between Unix- and Windows-specific files within the `git_` namespace to avoid symbol-clashes between libgit2 and pthreads, the rewritten wrappers have nothing to do with pthreads anymore. Rename the Windows-specific pthread-files to honor this change.
1 parent a342e87 commit 8aaa9fb

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# include "win32/error.h"
4646
# include "win32/version.h"
4747
# ifdef GIT_THREADS
48-
# include "win32/pthread.h"
48+
# include "win32/thread.h"
4949
# endif
5050
# if defined(GIT_MSVC_CRTDBG)
5151
# include "win32/w32_stack.h"

src/thread-utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ typedef git_atomic git_atomic_ssize;
4141
#ifdef GIT_THREADS
4242

4343
#ifdef GIT_WIN32
44-
# include "win32/pthread.h"
44+
# include "win32/thread.h"
4545
#else
4646
# include "unix/pthread.h"
4747
#endif

src/win32/precompiled.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <io.h>
1717
#include <direct.h>
1818
#ifdef GIT_THREADS
19-
#include "win32/pthread.h"
19+
#include "win32/thread.h"
2020
#endif
2121

2222
#include "git2.h"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* a Linking Exception. For full terms see the included COPYING file.
66
*/
77

8-
#include "pthread.h"
8+
#include "thread.h"
99
#include "../global.h"
1010

1111
#define CLEAN_THREAD_EXIT 0x6F012842
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* a Linking Exception. For full terms see the included COPYING file.
66
*/
77

8-
#ifndef GIT_PTHREAD_H
9-
#define GIT_PTHREAD_H
8+
#ifndef INCLUDE_win32_thread_h__
9+
#define INCLUDE_win32_thread_h__
1010

1111
#include "../common.h"
1212

@@ -59,4 +59,4 @@ int git_rwlock_free(git_rwlock *);
5959

6060
extern int win32_pthread_initialize(void);
6161

62-
#endif
62+
#endif /* INCLUDE_win32_thread_h__ */

0 commit comments

Comments
 (0)