提交 ae9eeaff 编写于 作者: B Behdad Esfahbod

Remove warning message from public header file

Since we now assert thos in hb-private.h, the int types cannot be wrong.
(Except for when someone else includes hb-common.h in a very broken
configuration, but that's not our problem!)

Plus, we don't use inline in the public headers, so remove that too.
上级 6fd5364b
...@@ -39,10 +39,6 @@ HB_BEGIN_DECLS ...@@ -39,10 +39,6 @@ HB_BEGIN_DECLS
#ifdef _MSC_VER #ifdef _MSC_VER
#define _HB__STR2__(x) #x
#define _HB__STR1__(x) _HB__STR2__(x)
#define _HB__LOC__ __FILE__ "("_HB__STR1__(__LINE__)") : Warning Msg: "
#pragma message(_HB__LOC__"Not using stdint.h; integer types may have wrong size")
typedef signed char int8_t; typedef signed char int8_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef signed short int16_t; typedef signed short int16_t;
...@@ -51,9 +47,6 @@ typedef signed int int32_t; ...@@ -51,9 +47,6 @@ typedef signed int int32_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
typedef signed long long int64_t; typedef signed long long int64_t;
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#ifndef __cplusplus
#define inline __inline
#endif
#else #else
#include <stdint.h> #include <stdint.h>
#endif #endif
......
...@@ -90,6 +90,7 @@ ASSERT_STATIC (sizeof (uint32_t) == 4); ...@@ -90,6 +90,7 @@ ASSERT_STATIC (sizeof (uint32_t) == 4);
ASSERT_STATIC (sizeof (int64_t) == 8); ASSERT_STATIC (sizeof (int64_t) == 8);
ASSERT_STATIC (sizeof (uint64_t) == 8); ASSERT_STATIC (sizeof (uint64_t) == 8);
ASSERT_STATIC (sizeof (hb_var_int_t) == 4);
/* Misc */ /* Misc */
...@@ -223,6 +224,9 @@ typedef GStaticMutex hb_mutex_t; ...@@ -223,6 +224,9 @@ typedef GStaticMutex hb_mutex_t;
#else #else
#ifdef _MSC_VER #ifdef _MSC_VER
#define _HB__STR2__(x) #x
#define _HB__STR1__(x) _HB__STR2__(x)
#define _HB__LOC__ __FILE__ "("_HB__STR1__(__LINE__)") : Warning Msg: "
#pragma message(_HB__LOC__"Could not find any system to define platform macros, library will NOT be thread-safe") #pragma message(_HB__LOC__"Could not find any system to define platform macros, library will NOT be thread-safe")
#else #else
#warning "Could not find any system to define platform macros, library will NOT be thread-safe" #warning "Could not find any system to define platform macros, library will NOT be thread-safe"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册