diff options
author | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
commit | 8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch) | |
tree | 158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/config.h | |
parent | 4a165ef2f762a4ce9155f2a3626692326bda616d (diff) | |
parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
download | vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2 vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated to latest CVS version of pthreads
Conflicts:
pthreads/Makefile
Diffstat (limited to 'pthreads/config.h')
-rw-r--r-- | pthreads/config.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pthreads/config.h b/pthreads/config.h index e231724e3..ccdff48da 100644 --- a/pthreads/config.h +++ b/pthreads/config.h @@ -46,7 +46,7 @@ /* Do we know about type mode_t? */ #undef HAVE_MODE_T -/* +/* * Define if GCC has atomic builtins, i.e. __sync_* intrinsics * __sync_lock_* is implemented in mingw32 gcc 4.5.2 at least * so this define does not turn those on or off. If you get an @@ -148,6 +148,4 @@ #define HAVE_C_INLINE #endif - - -#endif +#endif /* PTW32_CONFIG_H */ |