Fix undefined reference to c99_vsnprintf and ts_utf8_sequence_length when using mingw32 gcc.

The mingw32 gcc compiler doesn't treat __inline as Visual C++ does. Use `static inline` instead of `__inline` for c99_vsnprintf. Don't use `__inline` for ts_utf8_sequence_length.

Kubo Takehiro committed 8 years ago

Commit de2bbb31 parent df846b03 files · +10 −4Browse files

Unified · Split

3 files

include/cst_file.h +8 −2
include/cst_tokenstream.h +1 −1
src/utils/cst_tokenstream.c +1 −1

include/cst_file.h+8−2

 #ifdef _WIN32
 #define snprintf c99_snprintf
-__inline int c99_vsnprintf(char* str, size_t size, const char* format,
+#ifdef __GNUC__
+#define INLINE static inline
+#else
+#define INLINE __inline
+#endif
+INLINE int c99_vsnprintf(char* str, size_t size, const char* format,
 va_list ap)  {
        int count = -1;
        if (size != 0)
            count = _vscprintf(format, ap);
        return count;
    }
-__inline int c99_snprintf(char* str, size_t size, const char* format, ...)
+INLINE int c99_snprintf(char* str, size_t size, const char* format, ...)
 {
        int count;
        va_list ap;

include/cst_tokenstream.h+1−1

@@ -130,7 +130,7 @@ cst_tokenstream ts_open_generic(const char filename, · 129 unmodified lines
130	int (getc)(cst_tokenstream ts));	130	int (getc)(cst_tokenstream ts));
131	void ts_close(cst_tokenstream *ts);	131	void ts_close(cst_tokenstream *ts);
132		132
133	#ifdef _WIN32	133	#if defined(_WIN32) && !defined(__GNUC__)
134	__inline int ts_utf8_sequence_length(char c0);	134	__inline int ts_utf8_sequence_length(char c0);
135	#else	135	#else
136	int ts_utf8_sequence_length(char c0);	136	int ts_utf8_sequence_length(char c0);

src/utils/cst_tokenstream.c+1−1

@@ -266,7 +266,7 @@ static void get_token_sub_part(cst_tokenstream *ts, · 265 unmodified lines
266	(*buffer)[p] = '\0';	266	(*buffer)[p] = '\0';
267	}	267	}
268		268
269	#ifdef _WIN32	269	#if defined _WIN32 && !defined(__GNUC__)
270	__inline int ts_utf8_sequence_length(char c0)	270	__inline int ts_utf8_sequence_length(char c0)
271	#else	271	#else
272	int ts_utf8_sequence_length(char c0)	272	int ts_utf8_sequence_length(char c0)

Fix undefined reference to c99_vsnprintf and ts_utf8_sequence_length when using mingw32 gcc.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code