Provide better feature checking for stdbool
This commit is contained in:
parent
3808cb37aa
commit
c128cdef13
5 changed files with 23 additions and 23 deletions
|
@ -22,7 +22,6 @@ endif
|
|||
r3_includedir = $(includedir)/r3
|
||||
r3_include_HEADERS = \
|
||||
include/r3.h \
|
||||
include/r3_define.h \
|
||||
include/r3_list.h \
|
||||
include/r3_slug.h \
|
||||
include/r3_gvc.h \
|
||||
|
|
|
@ -10,6 +10,7 @@ AC_PROG_CC
|
|||
AC_PROG_CC_STDC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_INSTALL
|
||||
AC_HEADER_STDBOOL
|
||||
|
||||
# older debian
|
||||
AC_PROG_LIBTOOL
|
||||
|
|
22
include/r3.h
22
include/r3.h
|
@ -11,11 +11,31 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <pcre.h>
|
||||
|
||||
|
||||
|
||||
#ifdef HAVE_STDBOOL_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "r3_define.h"
|
||||
|
||||
#else
|
||||
|
||||
#if !defined(bool) && !defined(__cplusplus)
|
||||
typedef unsigned char bool;
|
||||
#endif
|
||||
#ifndef FALSE
|
||||
# define FALSE 0
|
||||
#endif
|
||||
#ifndef TRUE
|
||||
# define TRUE 1
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#include "str_array.h"
|
||||
#include "r3_slug.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* r3_define.h
|
||||
* Copyright (C) 2014 c9s <yoanlin93@gmail.com>
|
||||
*
|
||||
* Distributed under terms of the MIT license.
|
||||
*/
|
||||
|
||||
#ifndef DEFINE_H
|
||||
#define DEFINE_H
|
||||
#include <stdbool.h>
|
||||
#if !defined(bool) && !defined(__cplusplus)
|
||||
typedef unsigned char bool;
|
||||
#endif
|
||||
#ifndef FALSE
|
||||
# define FALSE 0
|
||||
#endif
|
||||
#ifndef TRUE
|
||||
# define TRUE 1
|
||||
#endif
|
||||
#endif /* !DEFINE_H */
|
|
@ -5,5 +5,5 @@
|
|||
"description": "high-performance path dispatching library",
|
||||
"keywords": ["path", "dispatch", "performance", "r3", "c9s"],
|
||||
"license": "MIT",
|
||||
"src": ["3rdparty/zmalloc.c", "3rdparty/zmalloc.h", "include/r3.h", "include/r3.hpp", "include/r3_define.h", "include/r3_gvc.h", "include/r3_json.h", "include/r3_list.h", "include/r3_slug.h", "include/str_array.h", "src/edge.c", "src/gvc.c", "src/json.c", "src/list.c", "src/match_entry.c", "src/node.c", "src/slug.c", "src/slug.h", "src/str.c", "src/token.c"]
|
||||
"src": ["3rdparty/zmalloc.c", "3rdparty/zmalloc.h", "include/r3.h", "include/r3.hpp", "include/r3_gvc.h", "include/r3_json.h", "include/r3_list.h", "include/r3_slug.h", "include/str_array.h", "src/edge.c", "src/gvc.c", "src/json.c", "src/list.c", "src/match_entry.c", "src/node.c", "src/slug.c", "src/slug.h", "src/str.c", "src/token.c"]
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue