@matheusbsbs / matheus-bagliano / commits / e7d5ce8165

mingw: avoid linking to the C library's isalpha()

The implementation of mingw_skip_dos_drive_prefix() calls isalpha() via has_dos_drive_prefix(). Since the definition occurs long before isalpha() is defined in git-compat-util.h, my build environment reports: CC alloc.o In file included from git-compat-util.h:186, from cache.h:4, from alloc.c:12: compat/mingw.h: In function 'mingw_skip_dos_drive_prefix': compat/mingw.h:365: warning: implicit declaration of function 'isalpha' Dscho does not see a similar warning in his build and suspects that ctype.h is included somehow behind the scenes. This implies that his build links to the C library's isalpha() and does not use git's isalpha(). To fix both the warning in my build and the inconsistency in Dscho's build, move the function definition to mingw.c. Then it picks up git's isalpha() because git-compat-util.h is included at the top of the file. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Sixt committed Jan 25, 2016 at 22:47 UTC e7d5ce816579723150c341116737fb51d8e33eb3

2 files changed +8 -6

compat/mingw.c

@@ -1915,6 +1915,13 @@ pid_t waitpid(pid_t pid, int *status, int options)

1915 return -1;

1916 }

1917

1918 +int mingw_skip_dos_drive_prefix(char **path)

1919 +{

1920 + int ret = has_dos_drive_prefix(*path);

1921 + *path += ret;

1922 + return ret;

1923 +}

1924 +

1925 int mingw_offset_1st_component(const char *path)

1926 {

1927 char *pos = (char *)path;

compat/mingw.h

+1 -6

@@ -360,12 +360,7 @@ HANDLE winansi_get_osfhandle(int fd);

360

361 #define has_dos_drive_prefix(path) \

362 (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)

363 -static inline int mingw_skip_dos_drive_prefix(char **path)

364 -{

365 - int ret = has_dos_drive_prefix(*path);

366 - *path += ret;

367 - return ret;

368 -}

363 +int mingw_skip_dos_drive_prefix(char **path);

364 #define skip_dos_drive_prefix mingw_skip_dos_drive_prefix

365 #define is_dir_sep(c) ((c) == '/' || (c) == '\\')

366 static inline char *mingw_find_last_dir_sep(const char *path)