diff options
author | Steven G. Johnson <stevenj@mit.edu> | 2014-07-18 11:47:24 -0400 |
---|---|---|
committer | Steven G. Johnson <stevenj@mit.edu> | 2014-07-18 11:47:24 -0400 |
commit | dd35a8530d4274ce7c4c0c080a66b283141b9454 (patch) | |
tree | 57cfc2da2dfdeca54fa041e1fbe5b9e23a9b1805 | |
parent | 48645e36e4e07d550cf5f410ec254c7a03937e6a (diff) | |
download | libutf8proc-dd35a8530d4274ce7c4c0c080a66b283141b9454.tar.gz libutf8proc-dd35a8530d4274ce7c4c0c080a66b283141b9454.tar.bz2 |
C++/MSVC compatibility, indenting, for #4
-rw-r--r-- | utf8proc.c | 4 | ||||
-rw-r--r-- | utf8proc.h | 16 |
2 files changed, 11 insertions, 9 deletions
@@ -536,7 +536,7 @@ ssize_t utf8proc_map( *dstptr = NULL; result = utf8proc_decompose(str, strlen, NULL, 0, options); if (result < 0) return result; - buffer = malloc(result * sizeof(int32_t) + 1); + buffer = (int32_t *) malloc(result * sizeof(int32_t) + 1); if (!buffer) return UTF8PROC_ERROR_NOMEM; result = utf8proc_decompose(str, strlen, buffer, result, options); if (result < 0) { @@ -550,7 +550,7 @@ ssize_t utf8proc_map( } { int32_t *newptr; - newptr = realloc(buffer, (size_t)result+1); + newptr = (int32_t *) realloc(buffer, (size_t)result+1); if (newptr) buffer = newptr; } *dstptr = (uint8_t *)buffer; @@ -60,16 +60,18 @@ typedef unsigned char uint8_t; typedef short int16_t; typedef unsigned short uint16_t; typedef int int32_t; -#ifdef _WIN64 -#define ssize_t __int64 -#else -#define ssize_t int -#endif +# ifdef _WIN64 +# define ssize_t __int64 +# else +# define ssize_t int +# endif +# ifndef __cplusplus typedef unsigned char bool; enum {false, true}; +# endif #else -#include <stdbool.h> -#include <inttypes.h> +# include <stdbool.h> +# include <inttypes.h> #endif #include <limits.h> |