ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

w32pthreads: Removed some unneeded cdecl specifiers on non-exported functions. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2295 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-12-03 23:05:49 +00:00
parent 1e431fb69a
commit 2413af5b6e
4 changed files with 9 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3rdparty/w32pthreads/include/pthread.h vendored
View File

@ -957,7 +957,7 @@ PTW32_DLLPORT int PTW32_CDECL pthread_join (pthread_t thread,
PTW32_DLLPORT pthread_t PTW32_CDECL pthread_self (void);
extern int PTW32_CDECL pthread_cancel (pthread_t thread);
extern int pthread_cancel (pthread_t thread);
PTW32_DLLPORT int PTW32_CDECL pthread_setcancelstate (int state,
int *oldstate);
@ -965,7 +965,7 @@ PTW32_DLLPORT int PTW32_CDECL pthread_setcancelstate (int state,
PTW32_DLLPORT int PTW32_CDECL pthread_setcanceltype (int type,
int *oldtype);
extern void PTW32_CDECL pthread_testcancel (void);
extern void pthread_testcancel (void);
PTW32_DLLPORT int PTW32_CDECL pthread_once (pthread_once_t * once_control,
void (*init_routine) (void));
@ -1031,14 +1031,14 @@ PTW32_DLLPORT int PTW32_CDECL pthread_mutex_init (pthread_mutex_t * mutex,
PTW32_DLLPORT int PTW32_CDECL pthread_mutex_destroy (pthread_mutex_t * mutex);
extern int PTW32_CDECL pthread_mutex_lock (pthread_mutex_t * mutex);
extern int pthread_mutex_lock (pthread_mutex_t * mutex);
PTW32_DLLPORT int PTW32_CDECL pthread_mutex_timedlock(pthread_mutex_t *mutex,
const struct timespec *abstime);
extern int PTW32_CDECL pthread_mutex_trylock (pthread_mutex_t * mutex);
extern int pthread_mutex_trylock (pthread_mutex_t * mutex);
extern int PTW32_CDECL pthread_mutex_unlock (pthread_mutex_t * mutex);
extern int pthread_mutex_unlock (pthread_mutex_t * mutex);
#ifdef PTW32_ALLOW_SPIN
/*

4
3rdparty/w32pthreads/include/semaphore.h vendored
View File

@ -132,9 +132,9 @@ PTW32_DLLPORT int __cdecl sem_init (sem_t * sem,
PTW32_DLLPORT int __cdecl sem_destroy (sem_t * sem);
extern int __cdecl sem_trywait (sem_t * sem);
extern int sem_trywait (sem_t * sem);
extern int __cdecl sem_wait (sem_t * sem);
extern int sem_wait (sem_t * sem);
PTW32_DLLPORT int __cdecl sem_timedwait (sem_t * sem,
const struct timespec * abstime);

149
3rdparty/w32pthreads/pthreads_lib_2008.vcproj vendored
View File

@ -46,6 +46,7 @@
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="ptw32pch.h"
WarningLevel="3"
CompileAs="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -166,6 +167,7 @@
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="ptw32pch.h"
WarningLevel="3"
CompileAs="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -207,127 +209,22 @@
<File
RelativePath=".\pthread_cancel.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\pthread_mutex_lock.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\pthread_mutex_trylock.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\pthread_mutex_unlock.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\pthread_testcancel.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\ptw32pch.c"
@ -367,52 +264,10 @@
<File
RelativePath=".\sem_trywait.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\sem_wait.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Devel|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<Filter
Name="piecesparts"

6
3rdparty/w32pthreads/sem_wait.c vendored
View File

@ -138,17 +138,11 @@ sem_wait (sem_t * sem)
if (v < 0)
{
#ifdef _MSC_VER
#pragma inline_depth(0)
#endif
/* Must wait */
pthread_cleanup_push(ptw32_sem_wait_cleanup, (void *) s);
result = pthreadCancelableWait (s->sem);
/* Cleanup if we're canceled or on any other error */
pthread_cleanup_pop(result);
#ifdef _MSC_VER
#pragma inline_depth()
#endif
}
#ifdef NEED_SEM