diff --git a/headers/posix/size_t.h b/headers/posix/size_t.h
index 0662047f6a..c8f2e7e743 100644
--- a/headers/posix/size_t.h
+++ b/headers/posix/size_t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, Haiku Inc. All Rights Reserved.
+ * Copyright 2008-2010, Haiku Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _SIZE_T_H_
@@ -7,7 +7,12 @@
 
 #include <stddef.h>
 
-/* TODO: ATM gcc's stddef.h defines ssize_t for BeOS.h. We should fix this.
- * typedef long signed int		ssize_t; */
+/* ATM we don't define ssize_t for GCC2 */
+#if __GNUC__ > 2 
+#ifndef __ssize_t__
+#define __ssize_t__
+typedef long signed int	ssize_t;
+#endif /* __ssize_t__ */
+#endif /* __GNUC__ > 2 */
 
 #endif /* _SIZE_T_H_ */