kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

internal/stdbool.h rework

Browse source 
Noticed that internal/stdbool.h and addr2line.c are the only two place
where missing/stdbool.h is included.  Why not delete the file so that
we can merge internal/stdbool.h and missing/stdbool.h into one.
This commit is contained in:
卜部昌平 2019-12-25 13:40:10 +09:00
parent 5e22f873ed
commit 8184adabe5
Notes: git 2019-12-26 20:45:54 +09:00 
Merged: https://github.com/ruby/ruby/pull/2711
3 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
addr2line.c
View file

@ -25,11 +25,7 @@
#include <libproc.h>
#endif
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
#else
#include "missing/stdbool.h"
#endif
#include "internal/stdbool.h"
#if defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H)

18
internal/stdbool.h
View file

@ -13,8 +13,22 @@
#ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#else
# include "missing/stdbool.h"
#endif
/* Note that we assume the compiler isn't C++. */
#ifdef __bool_true_false_are_defined
# undef bool
# undef true
# undef false
# undef __bool_true_false_are_defined
#else
typedef unsigned char _Bool;
#endif
/* See also http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2229.htm */
#define bool _Bool
#define true ((_Bool)+1)
#define false ((_Bool)+0)
#define __bool_true_false_are_defined
#endif /* INTERNAL_STDBOOL_H */

20
missing/stdbool.h
View file

@ -1,20 +0,0 @@
/*
* missing/stdbool.h: Quick alternative of C99 stdbool.h
*/
#ifndef _MISSING_STDBOOL_H_
#define _MISSING_STDBOOL_H_
#ifndef __bool_true_false_are_defined
# ifndef __cplusplus
# undef bool
# undef false
# undef true
# define bool signed char
# define false 0
# define true 1
# define __bool_true_false_are_defined 1
# endif
#endif
#endif /* _MISSING_STDBOOL_H_ */