Reverted r24406. If it builds, it doesn't always work as well. The
change resulted in "version mismatch between boot loader and kernel". So apparently the size of some type changed unintentionally. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24408 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,13 +1,7 @@
|
||||
/*
|
||||
* Copyright 2008, Haiku Inc. All Rights Reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _SIZE_T_H_
|
||||
#define _SIZE_T_H_
|
||||
|
||||
#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;
|
||||
typedef unsigned long size_t;
|
||||
typedef signed long ssize_t;
|
||||
|
||||
#endif /* _SIZE_T_H_ */
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
#ifndef _STDDEF_H_
|
||||
#define _STDDEF_H_
|
||||
/*
|
||||
** Distributed under the terms of the OpenBeOS License.
|
||||
*/
|
||||
#include <null.h>
|
||||
|
||||
#if defined(__GNUC__) && __GNUC__ > 3
|
||||
#define offsetof(type,member) __builtin_offsetof(type, member)
|
||||
#else
|
||||
#define offsetof(type,member) ((size_t)&((type*)0)->member)
|
||||
#endif
|
||||
|
||||
typedef long ptrdiff_t;
|
||||
|
||||
#include <wchar_t.h>
|
||||
#include <size_t.h>
|
||||
|
||||
#endif /* _STDDEF_H_ */
|
||||
+3
-13
@@ -7,22 +7,11 @@
|
||||
#ifndef _WCHAR_H
|
||||
#define _WCHAR_H
|
||||
|
||||
#include <stddef.h>
|
||||
#include <wchar_t.h>
|
||||
#include <stdio.h>
|
||||
|
||||
// stddef.h is not supposed to define wint_t, but gcc 2.95.3's one does.
|
||||
// In all other cases we will do that.
|
||||
#ifndef _WINT_T
|
||||
#define _WINT_T
|
||||
|
||||
#ifndef __WINT_TYPE__
|
||||
#define __WINT_TYPE__ unsigned int
|
||||
#endif
|
||||
|
||||
typedef __WINT_TYPE__ wint_t;
|
||||
|
||||
#endif // _WINT_T
|
||||
|
||||
typedef unsigned int wint_t;
|
||||
typedef int wctype_t;
|
||||
|
||||
typedef struct {
|
||||
@@ -30,6 +19,7 @@ typedef struct {
|
||||
wint_t __value;
|
||||
} mbstate_t;
|
||||
|
||||
#include <size_t.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
+12
-4
@@ -1,7 +1,15 @@
|
||||
/*
|
||||
* Copyright 2008, Haiku Inc. All Rights Reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
* Copyright (C) 2002 Marcus Overhagen
|
||||
* All rights reserved.
|
||||
*
|
||||
* Distributed under the terms of the MIT license
|
||||
*/
|
||||
#ifndef _WCHAR_T_H
|
||||
#define _WCHAR_T_H
|
||||
|
||||
#if !defined(__cplusplus) || __GNUC__ < 3
|
||||
typedef unsigned short wchar_t;
|
||||
#endif
|
||||
|
||||
#endif /* _WCHAR_T_H */
|
||||
|
||||
// Include GCC's stddef.h. It defines wchar_t.
|
||||
#include <stddef.h>
|
||||
|
||||
Reference in New Issue
Block a user