You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
173 lines
6.7 KiB
173 lines
6.7 KiB
fix from upstream
|
|
|
|
From 38693b251f5d80a7414b077e02c1636af65afb3d Mon Sep 17 00:00:00 2001
|
|
From: Craig Andrews <candrews@integralblue.com>
|
|
Date: Thu, 30 Jul 2015 23:06:41 -0400
|
|
Subject: [PATCH] [rsxs] Use stdbool.h from GCC 5.2.0
|
|
|
|
---
|
|
xbmc/screensavers/rsxs-0.9/lib/stdbool_.h | 137 +++++++++---------------------
|
|
1 file changed, 38 insertions(+), 99 deletions(-)
|
|
|
|
diff --git a/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h b/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h
|
|
index efa80ba..a951510 100644
|
|
--- a/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h
|
|
+++ b/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h
|
|
@@ -1,115 +1,54 @@
|
|
-/* Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
|
|
- Written by Bruno Haible <haible@clisp.cons.org>, 2001.
|
|
+/* Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
|
|
|
- This program is free software; you can redistribute it and/or modify
|
|
- it under the terms of the GNU General Public License as published by
|
|
- the Free Software Foundation; either version 2, or (at your option)
|
|
- any later version.
|
|
+This file is part of GCC.
|
|
|
|
- This program is distributed in the hope that it will be useful,
|
|
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
- GNU General Public License for more details.
|
|
+GCC is free software; you can redistribute it and/or modify
|
|
+it under the terms of the GNU General Public License as published by
|
|
+the Free Software Foundation; either version 3, or (at your option)
|
|
+any later version.
|
|
|
|
- You should have received a copy of the GNU General Public License
|
|
- along with this program; if not, write to the Free Software Foundation,
|
|
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
|
+GCC is distributed in the hope that it will be useful,
|
|
+but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+GNU General Public License for more details.
|
|
|
|
-#ifndef _STDBOOL_H
|
|
-#define _STDBOOL_H
|
|
-
|
|
-/* ISO C 99 <stdbool.h> for platforms that lack it. */
|
|
-
|
|
-/* Usage suggestions:
|
|
-
|
|
- Programs that use <stdbool.h> should be aware of some limitations
|
|
- and standards compliance issues.
|
|
-
|
|
- Standards compliance:
|
|
+Under Section 7 of GPL version 3, you are granted additional
|
|
+permissions described in the GCC Runtime Library Exception, version
|
|
+3.1, as published by the Free Software Foundation.
|
|
|
|
- - <stdbool.h> must be #included before 'bool', 'false', 'true'
|
|
- can be used.
|
|
+You should have received a copy of the GNU General Public License and
|
|
+a copy of the GCC Runtime Library Exception along with this program;
|
|
+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
+<http://www.gnu.org/licenses/>. */
|
|
|
|
- - You cannot assume that sizeof (bool) == 1.
|
|
+/*
|
|
+ * ISO C Standard: 7.16 Boolean type and values <stdbool.h>
|
|
+ */
|
|
|
|
- - Programs should not undefine the macros bool, true, and false,
|
|
- as C99 lists that as an "obsolescent feature".
|
|
-
|
|
- Limitations of this substitute, when used in a C89 environment:
|
|
-
|
|
- - <stdbool.h> must be #included before the '_Bool' type can be used.
|
|
-
|
|
- - You cannot assume that _Bool is a typedef; it might be a macro.
|
|
+#ifndef _STDBOOL_H
|
|
+#define _STDBOOL_H
|
|
|
|
- - In C99, casts and automatic conversions to '_Bool' or 'bool' are
|
|
- performed in such a way that every nonzero value gets converted
|
|
- to 'true', and zero gets converted to 'false'. This doesn't work
|
|
- with this substitute. With this substitute, only the values 0 and 1
|
|
- give the expected result when converted to _Bool' or 'bool'.
|
|
+#ifndef __cplusplus
|
|
|
|
- Also, it is suggested that programs use 'bool' rather than '_Bool';
|
|
- this isn't required, but 'bool' is more common. */
|
|
+#define bool _Bool
|
|
+#define true 1
|
|
+#define false 0
|
|
|
|
+#else /* __cplusplus */
|
|
|
|
-/* 7.16. Boolean type and values */
|
|
+/* Supporting _Bool in C++ is a GCC extension. */
|
|
+#define _Bool bool
|
|
|
|
-/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same
|
|
- definitions below, but temporarily we have to #undef them. */
|
|
-#ifdef __BEOS__
|
|
-# include <OS.h> /* defines bool but not _Bool */
|
|
-# undef false
|
|
-# undef true
|
|
+#if __cplusplus < 201103L
|
|
+/* Defining these macros in C++98 is a GCC extension. */
|
|
+#define bool bool
|
|
+#define false false
|
|
+#define true true
|
|
#endif
|
|
|
|
-/* For the sake of symbolic names in gdb, we define true and false as
|
|
- enum constants, not only as macros.
|
|
- It is tempting to write
|
|
- typedef enum { false = 0, true = 1 } _Bool;
|
|
- so that gdb prints values of type 'bool' symbolically. But if we do
|
|
- this, values of type '_Bool' may promote to 'int' or 'unsigned int'
|
|
- (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
|
|
- (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
|
|
- enum; this ensures that '_Bool' promotes to 'int'. */
|
|
-#if defined __cplusplus || defined __BEOS__
|
|
- /* A compiler known to have 'bool'. */
|
|
- /* If the compiler already has both 'bool' and '_Bool', we can assume they
|
|
- are the same types. */
|
|
-# if !@HAVE__BOOL@
|
|
-typedef bool _Bool;
|
|
-# endif
|
|
-#else
|
|
-# if !defined __GNUC__
|
|
- /* If @HAVE__BOOL@:
|
|
- Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
|
|
- the built-in _Bool type is used. See
|
|
- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
|
|
- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
|
|
- http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
|
|
- Similar bugs are likely with other compilers as well; this file
|
|
- wouldn't be used if <stdbool.h> was working.
|
|
- So we override the _Bool type.
|
|
- If !@HAVE__BOOL@:
|
|
- Need to define _Bool ourselves. As 'signed char' or as an enum type?
|
|
- Use of a typedef, with SunPRO C, leads to a stupid
|
|
- "warning: _Bool is a keyword in ISO C99".
|
|
- Use of an enum type, with IRIX cc, leads to a stupid
|
|
- "warning(1185): enumerated type mixed with another type".
|
|
- The only benefit of the enum type, debuggability, is not important
|
|
- with these compilers. So use 'signed char' and no typedef. */
|
|
-# define _Bool signed char
|
|
-enum { false = 0, true = 1 };
|
|
-# else
|
|
- /* With this compiler, trust the _Bool type if the compiler has it. */
|
|
-# if !@HAVE__BOOL@
|
|
-typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
|
|
-# endif
|
|
-# endif
|
|
-#endif
|
|
-#define bool _Bool
|
|
+#endif /* __cplusplus */
|
|
|
|
-/* The other macros must be usable in preprocessor directives. */
|
|
-#define false 0
|
|
-#define true 1
|
|
-#define __bool_true_false_are_defined 1
|
|
+/* Signal that all the definitions are present. */
|
|
+#define __bool_true_false_are_defined 1
|
|
|
|
-#endif /* _STDBOOL_H */
|
|
+#endif /* stdbool.h */
|
|
--
|
|
2.4.4
|
|
|