mirror of
				https://git.proxmox.com/git/libgit2
				synced 2025-11-04 04:38:58 +00:00 
			
		
		
		
	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.
This commit is contained in:
		
							parent
							
								
									a342e870fc
								
							
						
					
					
						commit
						8aaa9fb623
					
				@ -45,7 +45,7 @@
 | 
			
		||||
# include "win32/error.h"
 | 
			
		||||
# include "win32/version.h"
 | 
			
		||||
# ifdef GIT_THREADS
 | 
			
		||||
#	include "win32/pthread.h"
 | 
			
		||||
#	include "win32/thread.h"
 | 
			
		||||
# endif
 | 
			
		||||
# if defined(GIT_MSVC_CRTDBG)
 | 
			
		||||
#   include "win32/w32_stack.h"
 | 
			
		||||
 | 
			
		||||
@ -41,7 +41,7 @@ typedef git_atomic git_atomic_ssize;
 | 
			
		||||
#ifdef GIT_THREADS
 | 
			
		||||
 | 
			
		||||
#ifdef GIT_WIN32
 | 
			
		||||
#   include "win32/pthread.h"
 | 
			
		||||
#   include "win32/thread.h"
 | 
			
		||||
#else
 | 
			
		||||
#   include "unix/pthread.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@ -16,7 +16,7 @@
 | 
			
		||||
#include <io.h>
 | 
			
		||||
#include <direct.h>
 | 
			
		||||
#ifdef GIT_THREADS
 | 
			
		||||
 #include "win32/pthread.h"
 | 
			
		||||
 #include "win32/thread.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "git2.h"
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,7 @@
 | 
			
		||||
 * a Linking Exception. For full terms see the included COPYING file.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "pthread.h"
 | 
			
		||||
#include "thread.h"
 | 
			
		||||
#include "../global.h"
 | 
			
		||||
 | 
			
		||||
#define CLEAN_THREAD_EXIT 0x6F012842
 | 
			
		||||
@ -5,8 +5,8 @@
 | 
			
		||||
 * a Linking Exception. For full terms see the included COPYING file.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifndef GIT_PTHREAD_H
 | 
			
		||||
#define GIT_PTHREAD_H
 | 
			
		||||
#ifndef INCLUDE_win32_thread_h__
 | 
			
		||||
#define INCLUDE_win32_thread_h__
 | 
			
		||||
 | 
			
		||||
#include "../common.h"
 | 
			
		||||
 | 
			
		||||
@ -59,4 +59,4 @@ int git_rwlock_free(git_rwlock *);
 | 
			
		||||
 | 
			
		||||
extern int win32_pthread_initialize(void);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
#endif /* INCLUDE_win32_thread_h__ */
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user