--- parser3/src/include/pa_common.h 2016/07/26 13:20:23 1.165 +++ parser3/src/include/pa_common.h 2016/09/21 14:01:45 1.167 @@ -8,7 +8,7 @@ #ifndef PA_COMMON_H #define PA_COMMON_H -#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.165 2016/07/26 13:20:23 moko Exp $" +#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.167 2016/09/21 14:01:45 moko Exp $" #include "pa_string.h" #include "pa_hash.h" @@ -55,11 +55,11 @@ typedef HASH_STRING HashStringVa // replace system s*nprintf with our versions #undef vsnprintf -int __vsnprintf(char *, size_t, const char* , va_list); -#define vsnprintf __vsnprintf +int pa_vsnprintf(char *, size_t, const char* , va_list); +#define vsnprintf pa_vsnprintf #undef snprintf -int __snprintf(char *, size_t, const char* , ...); -#define snprintf __snprintf +int pa_snprintf(char *, size_t, const char* , ...); +#define snprintf pa_snprintf #ifdef _MSC_VER @@ -302,7 +302,7 @@ extern const String file_status_name; #ifndef DOXYGEN enum Table2hash_distint { D_ILLEGAL, D_FIRST }; -enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE }; +enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE, C_CODE }; #endif #endif