Author: bonefish Date: 2011-06-12 00:57:47 +0200 (Sun, 12 Jun 2011) New Revision: 42113 Changeset: https://dev.haiku-os.org/changeset/42113 Modified: haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/types.h haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/typesizes.h Log: This is all quite a mess -- uncommented glibc's __timer_t and __TIMER_T_TYPE types to avoid build issues (gcc 2). Modified: haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/types.h =================================================================== --- haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/types.h 2011-06-11 22:51:24 UTC (rev 42112) +++ haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/types.h 2011-06-11 22:57:47 UTC (rev 42113) @@ -155,7 +155,7 @@ typedef __CLOCKID_T_TYPE __clockid_t; /* Timer ID returned by `timer_create'. */ -typedef __TIMER_T_TYPE __timer_t; +//typedef __TIMER_T_TYPE __timer_t; /* Type to represent block size. */ typedef __BLKSIZE_T_TYPE __blksize_t; Modified: haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/typesizes.h =================================================================== --- haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/typesizes.h 2011-06-11 22:51:24 UTC (rev 42112) +++ haiku/branches/developer/bonefish/signals-merge/src/system/libroot/posix/glibc/include/bits/typesizes.h 2011-06-11 22:57:47 UTC (rev 42113) @@ -54,7 +54,7 @@ #define __SWBLK_T_TYPE __SLONGWORD_TYPE #define __KEY_T_TYPE __S32_TYPE #define __CLOCKID_T_TYPE __S32_TYPE -#define __TIMER_T_TYPE __S32_TYPE +//#define __TIMER_T_TYPE __S32_TYPE #define __BLKSIZE_T_TYPE __SLONGWORD_TYPE #define __FSID_T_TYPE struct { int __val[2]; }