i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preparations for removing __BEOS__ from the compiler defines.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28305 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-10-23 21:46:26 +00:00
parent 889903f9dd
commit bc3955fea5
136 changed files with 244 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/gcc-2.95.3/stdarg.h
+1 -1
View File
@@ -67,7 +67,7 @@
#ifndef __GNUC_VA_LIST
#define __GNUC_VA_LIST
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) || defined(__BEOS__)
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) || defined(__BEOS__) || defined(__HAIKU__)
typedef char *__gnuc_va_list;
#else
typedef void *__gnuc_va_list;
headers/build/gcc-2.95.3/stdbool.h
+1 -1
View File
@@ -2,7 +2,7 @@
#ifndef __STDBOOL_H__
#define __STDBOOL_H__ 1
#ifdef __BEOS__
#if defined(__BEOS__) || defined(__HAIKU__)
typedef unsigned char _Bool;
#define bool _Bool
#define false 0
headers/build/gcc-2.95.3/stddef.h
+2 -2
View File
@@ -168,9 +168,9 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
#endif
#if !(defined (__GNUG__) && defined (size_t))
typedef __SIZE_TYPE__ size_t;
#ifdef __BEOS__
#if defined(__BEOS__) || defined(__HAIKU__)
typedef long ssize_t;
#endif /* __BEOS__ */
#endif /* __BEOS__ || __HAIKU__ */
#endif /* !(defined (__GNUG__) && defined (size_t)) */
#endif /* __size_t */
#endif /* _SIZET_ */
headers/build/gcc-2.95.3/varargs.h
+1 -1
View File
@@ -101,7 +101,7 @@ typedef int __builtin_va_alist_t __attribute__((__mode__(__word__)));
#ifndef __GNUC_VA_LIST
#define __GNUC_VA_LIST
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__BEOS__)
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__BEOS__) || defined(__HAIKU__)
typedef char *__gnuc_va_list;
#else
typedef void *__gnuc_va_list;
headers/build/os/opengl/GL/gl.h
+2 -2
View File
@@ -38,7 +38,7 @@
*/
#if !defined(__SCITECH_SNAP__)
#if defined(__BEOS__)
#if (defined(__BEOS__) || defined(__HAIKU__))
#include <stdlib.h> /* to get some BeOS-isms */
#endif
@@ -67,7 +67,7 @@
# define GLAPIENTRY
#endif /* WIN32 && !CYGWIN */
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
#if ((defined(__BEOS__) || defined(__HAIKU__)) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
# define PRAGMA_EXPORT_SUPPORTED 1
#endif
headers/cpp/defalloc.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include <stddef.h>
#include <stdlib.h>
#include <limits.h>
#if __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
# include <stdio.h>
#else
#include <iostream.h>
@@ -43,7 +43,7 @@ inline T* allocate(ptrdiff_t size, T*) {
set_new_handler(0);
T* tmp = (T*)(::operator new((size_t)(size * sizeof(T))));
if (tmp == 0) {
#if __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
fprintf(stderr, "out of memory\n");
#else
cerr << "out of memory" << endl;
headers/cpp/std/bastring.h
+2 -2
View File
@@ -61,7 +61,7 @@ extern void __length_error (const char *);
#endif
#ifdef __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
// Needed for atomic_add():
typedef long int32;
typedef volatile long vint32;
@@ -79,7 +79,7 @@ private:
charT* data () { return reinterpret_cast<charT *>(this + 1); }
charT& operator[] (size_t s) { return data () [s]; }
#ifdef __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
charT* grab () { if (selfish) return clone (); atomic_add((vint32*) &ref, 1); return data (); }
void release() { if (atomic_add((int32*) &ref, -1) == 1) delete this; }
#else
headers/cpp/stl_alloc.h
+3 -3
View File
@@ -42,7 +42,7 @@
# include <new>
# define __THROW_BAD_ALLOC throw bad_alloc()
#elif !defined(__THROW_BAD_ALLOC)
#if __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
# include <stdio.h>
# define __THROW_BAD_ALLOC fprintf(stderr, "out of memory\n"); exit(1)
#else
@@ -329,7 +329,7 @@ private:
// instead of enum { x = N }, but few compilers accept the former.
# ifndef __SUNPRO_CC
enum {_ALIGN = 8};
# if defined __BEOS__
# if (defined(__BEOS__) || defined(__HAIKU__))
enum {_MAX_BYTES = 0};
# else
enum {_MAX_BYTES = 128};
@@ -710,7 +710,7 @@ template <bool __threads, int __inst>
__default_alloc_template<__threads, __inst>::_Obj* __VOLATILE
__default_alloc_template<__threads, __inst> ::_S_free_list[
_NFREELISTS
#if defined __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
] = { };
#else
] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
headers/cpp/stl_config.h
+1 -1
View File
@@ -291,7 +291,7 @@
!defined(__STL_NON_TYPE_TMPL_PARAM_BUG) && \
!defined(__STL_LIMITED_DEFAULT_TEMPLATES) && \
!defined(__STL_USE_SGI_ALLOCATORS) || \
defined(__BEOS__)
(defined(__BEOS__) || defined(__HAIKU__))
# define __STL_USE_STD_ALLOCATORS
# endif
headers/libs/expat/expat_external.h
+1 -1
View File
@@ -4,7 +4,7 @@
/* External API definitions */
#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
#if defined(_MSC_EXTENSIONS) && !(defined(__BEOS__) || defined(__HAIKU__)) && !defined(__CYGWIN__)
#define XML_USE_MSC_EXTENSIONS 1
#endif
headers/libs/ncurses/curses.h
+1 -1
View File
@@ -439,7 +439,7 @@ extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
*/
#if 1
#ifdef NCURSES_WGETCH_EVENTS
#if !defined(__BEOS__) /* Fix _nc_timed_wait() on BEOS... */
#if !(defined(__BEOS__) || defined(__HAIKU__)) /* Fix _nc_timed_wait() on BEOS... */
# define NCURSES_EVENT_VERSION 1
#endif /* !defined(__BEOS__) */
headers/libs/zlib/zconf.h
+1 -1
View File
@@ -231,7 +231,7 @@
# endif
#endif
#if defined (__BEOS__)
#if (defined(__BEOS__) || defined(__HAIKU__))
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
headers/os/drivers/pcmcia/cs.h
+1 -1
View File
@@ -436,7 +436,7 @@ extern int CardServices(int func, void *a1, void *a2, void *a3);
extern int CardServices(int func, ...);
#endif
#ifdef __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
#define SS_MODULE_NAME(s) ("busses/pcmcia/" s "/v1")
#define MTD_MODULE_NAME(s) ("busses/pcmcia/" s "/v1")
#define CS_CLIENT_MODULE_NAME "bus_managers/pcmcia_cs/client/v1"
headers/os/drivers/pcmcia/ds.h
+2 -2
View File
@@ -129,7 +129,7 @@ typedef union ds_ioctl_arg_t {
typedef struct dev_link_t {
dev_node_t *dev;
u_int state, open;
#ifndef __BEOS__
#if (!defined(__BEOS__) && !defined(__HAIKU__))
wait_queue_head_t pending;
struct timer_list release;
#endif
@@ -164,7 +164,7 @@ int unregister_pccard_driver(dev_info_t *dev_info);
#define register_pcmcia_driver register_pccard_driver
#define unregister_pcmcia_driver unregister_pccard_driver
#ifdef __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
#define DS_MODULE_NAME "bus_managers/pcmcia_ds/v2"
typedef struct ds_module_info {
bus_manager_info binfo;
headers/os/opengl/GL/gl.h
+2 -2
View File
@@ -38,7 +38,7 @@
*/
#if !defined(__SCITECH_SNAP__)
#if defined(__BEOS__)
#if (defined(__BEOS__) || defined(__HAIKU__))
#include <stdlib.h> /* to get some BeOS-isms */
#endif
@@ -67,7 +67,7 @@
# define GLAPIENTRY
#endif /* WIN32 && !CYGWIN */
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
#if ((defined(__BEOS__) || defined(__HAIKU__)) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
# define PRAGMA_EXPORT_SUPPORTED 1
#endif
headers/private/mail/regex.h
+1 -1
View File
@@ -28,7 +28,7 @@
#ifndef _REGEX_H
#define _REGEX_H 1
#ifdef __BEOS__
#if (defined(__BEOS__) || defined(__HAIKU__))
# undef __STDC__
# define __STDC__ 1
#endif
headers/tools/cppunit/cppunit/Portability.h
+1 -1
View File
@@ -16,7 +16,7 @@
*/
#if defined(__POWERPC__) && defined(__BEOS__)
#if defined(__POWERPC__) && (defined(__BEOS__) || defined(__HAIKU__))
#define CPPUNIT_HAVE_SSTREAM 1
#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
#endif