simplify last change

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31187 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-08-19 21:08:37 +00:00
parent 9390c9ae42
commit fd458700cb
3 changed files with 6 additions and 9 deletions

View file

@ -3,7 +3,6 @@
* configure.ac: Check alignment of pthread types * configure.ac: Check alignment of pthread types
* configure: Regenerate * configure: Regenerate
* Headers/Additions/GNUstepBase/GSConfig.h.in: Record alignment * Headers/Additions/GNUstepBase/GSConfig.h.in: Record alignment
* Headers/Foundation/NSLock.h: Use alignment.
2010-08-18 Richard Frith-Macdonald <rfm@gnu.org> 2010-08-18 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -212,12 +212,10 @@ typedef gsuaddr gsaddr;
*/ */
typedef struct { typedef struct {
uint8_t dummy[@GS_SIZEOF_COND_T@]; uint8_t dummy[@GS_SIZEOF_COND_T@];
} gs_cond_t; } gs_cond_t __attribute__((aligned (@GS_ALIGNOF_COND_T@)));
typedef struct { typedef struct {
uint8_t dummy[@GS_SIZEOF_MUTEX_T@]; uint8_t dummy[@GS_SIZEOF_MUTEX_T@];
} gs_mutex_t; } gs_mutex_t __attribute__((aligned (@GS_ALIGNOF_MUTEX_T@)));
#define GS_ALIGNOF_COND_T @GS_ALIGNOF_COND_T@
#define GS_ALIGNOF_MUTEX_T @GS_ALIGNOF_MUTEX_T@
#define OBJC2RUNTIME @OBJC2RUNTIME@ #define OBJC2RUNTIME @OBJC2RUNTIME@
#define BASE_NATIVE_OBJC_EXCEPTIONS @BASE_NATIVE_OBJC_EXCEPTIONS@ #define BASE_NATIVE_OBJC_EXCEPTIONS @BASE_NATIVE_OBJC_EXCEPTIONS@

View file

@ -73,7 +73,7 @@ extern "C" {
{ {
#if GS_EXPOSE(NSLock) #if GS_EXPOSE(NSLock)
@private @private
gs_mutex_t _mutex __attribute__((aligned(GS_ALIGNOF_MUTEX_T))); gs_mutex_t _mutex;
NSString *_name; NSString *_name;
#endif #endif
} }
@ -117,8 +117,8 @@ extern "C" {
{ {
#if GS_EXPOSE(NSCondition) #if GS_EXPOSE(NSCondition)
@private @private
gs_cond_t _condition __attribute__((aligned(GS_ALIGNOF_COND_T))); gs_cond_t _condition;
gs_mutex_t _mutex __attribute__((aligned(GS_ALIGNOF_MUTEX_T))); gs_mutex_t _mutex;
NSString *_name; NSString *_name;
#endif #endif
} }
@ -260,7 +260,7 @@ extern "C" {
{ {
#if GS_EXPOSE(NSRecursiveLock) #if GS_EXPOSE(NSRecursiveLock)
@private @private
gs_mutex_t _mutex __attribute__((aligned(GS_ALIGNOF_MUTEX_T))); gs_mutex_t _mutex;
NSString *_name; NSString *_name;
#endif #endif
} }