From dfb9441e8cbc00ae28604700f7e2200eeaa2e64d Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Mon, 14 Jul 2014 19:59:29 +0400 Subject: [PATCH] Removed typedefs for basic int types and bool, definition of NULL from globals.h. Included , , in that header. --- src/globals.h | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/globals.h b/src/globals.h index 2fcfe2972..7eee61bd1 100644 --- a/src/globals.h +++ b/src/globals.h @@ -16,22 +16,15 @@ #ifndef JERRY_GLOBALS_H #define JERRY_GLOBALS_H +#include +#include +#include + /** * Types */ typedef unsigned long mword_t; -typedef mword_t uintptr_t; -typedef mword_t size_t; typedef signed long ssize_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned long long uint64_t; -typedef signed int int32_t; - -typedef enum { - false, true -} bool; /** * Attributes @@ -43,8 +36,6 @@ typedef enum { /** * Constants */ -#define NULL ((void*)0) - #define JERRY_BITSINBYTE 8 /** @@ -99,7 +90,7 @@ extern void __noreturn jerry_AssertFail( const char *assertion, const char *file /** * Mark for unreachable points and unimplemented cases */ -#define JERRY_UNREACHABLE() do { JERRY_ASSERT( false); __builtin_trap(); } while (0) +#define JERRY_UNREACHABLE() do { JERRY_ASSERT( false); jerry_Exit( ERR_GENERAL); } while (0) #define JERRY_UNIMPLEMENTED() JERRY_UNREACHABLE() /**