All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	git@vger.kernel.org, Ramsay Jones <ramsay@ramsayjones.plus.com>,
	Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH] mingw: avoid linking to the C library's isalpha()
Date: Mon, 25 Jan 2016 22:47:56 +0100	[thread overview]
Message-ID: <56A6980C.6040701@kdbg.org> (raw)
In-Reply-To: <xmqqzivubpac.fsf@gitster.mtv.corp.google.com>

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>
---
 compat/mingw.c | 7 +++++++
 compat/mingw.h | 7 +------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 10a51c0..0cebb61 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1915,6 +1915,13 @@ pid_t waitpid(pid_t pid, int *status, int options)
 	return -1;
 }
 
+int mingw_skip_dos_drive_prefix(char **path)
+{
+	int ret = has_dos_drive_prefix(*path);
+	*path += ret;
+	return ret;
+}
+
 int mingw_offset_1st_component(const char *path)
 {
 	char *pos = (char *)path;
diff --git a/compat/mingw.h b/compat/mingw.h
index 9b5db4e..2099b79 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -360,12 +360,7 @@ HANDLE winansi_get_osfhandle(int fd);
 
 #define has_dos_drive_prefix(path) \
 	(isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
-static inline int mingw_skip_dos_drive_prefix(char **path)
-{
-	int ret = has_dos_drive_prefix(*path);
-	*path += ret;
-	return ret;
-}
+int mingw_skip_dos_drive_prefix(char **path);
 #define skip_dos_drive_prefix mingw_skip_dos_drive_prefix
 #define is_dir_sep(c) ((c) == '/' || (c) == '\\')
 static inline char *mingw_find_last_dir_sep(const char *path)
-- 
2.7.0.118.g90056ae

  reply	other threads:[~2016-01-25 21:48 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-30 14:50 [PATCH] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2015-09-30 18:24 ` Junio C Hamano
2016-01-08 16:17   ` Johannes Schindelin
2015-09-30 18:57 ` Ramsay Jones
2016-01-08 16:18   ` Johannes Schindelin
2016-01-08 16:21 ` [PATCH v2 0/4] Ensure that we can build without libgen.h Johannes Schindelin
2016-01-08 16:21   ` [PATCH v2 1/4] Refactor skipping DOS drive prefixes Johannes Schindelin
2016-01-08 21:51     ` Eric Sunshine
2016-01-08 22:07       ` Junio C Hamano
2016-01-11  9:32         ` Johannes Schindelin
2016-01-11 15:58           ` Junio C Hamano
2016-01-08 16:21   ` [PATCH v2 2/4] compat/basename: make basename() conform to POSIX Johannes Schindelin
2016-01-08 18:45     ` Junio C Hamano
2016-01-09 14:53       ` Johannes Schindelin
2016-01-11 16:01         ` Junio C Hamano
2016-01-08 16:21   ` [PATCH v2 3/4] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2016-01-08 18:53     ` Junio C Hamano
2016-01-08 16:21   ` [PATCH v2 4/4] t0060: verify that basename() and dirname() work as expected Johannes Schindelin
2016-01-10  4:17     ` Eric Sunshine
2016-01-11 10:50       ` Johannes Schindelin
2016-01-13 18:52     ` Michael Blume
2016-01-13 19:43       ` Junio C Hamano
2016-01-14  6:09         ` Johannes Schindelin
2016-01-11 18:29   ` [PATCH v3 0/4] Ensure that we can build without libgen.h Johannes Schindelin
2016-01-11 18:29     ` [PATCH v3 1/4] Refactor skipping DOS drive prefixes Johannes Schindelin
2016-01-11 18:29     ` [PATCH v3 2/4] compat/basename: make basename() conform to POSIX Johannes Schindelin
2016-01-11 18:30     ` [PATCH v3 3/4] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2016-01-11 20:33       ` Eric Sunshine
2016-01-11 22:56         ` Junio C Hamano
2016-01-12  7:57           ` Johannes Schindelin
2016-01-11 18:30     ` [PATCH v3 4/4] t0060: verify that basename() and dirname() work as expected Johannes Schindelin
2016-01-11 22:59     ` [PATCH v3 0/4] Ensure that we can build without libgen.h Junio C Hamano
2016-01-12  7:57     ` [PATCH v4 " Johannes Schindelin
2016-01-12  7:57       ` [PATCH v4 1/4] Refactor skipping DOS drive prefixes Johannes Schindelin
2016-01-22 18:50         ` Johannes Sixt
2016-01-22 19:09           ` Junio C Hamano
2016-01-23  8:25             ` Johannes Schindelin
2016-01-23 19:02               ` Johannes Sixt
2016-01-24 10:56                 ` Johannes Schindelin
2016-01-24 12:36                   ` Johannes Sixt
2016-01-24 22:12                     ` Junio C Hamano
2016-01-25 21:47                       ` Johannes Sixt [this message]
2016-01-25 22:04                         ` [PATCH] mingw: avoid linking to the C library's isalpha() Junio C Hamano
2016-01-12  7:57       ` [PATCH v4 2/4] compat/basename: make basename() conform to POSIX Johannes Schindelin
2016-01-13  0:49         ` Ramsay Jones
2016-01-13  7:14           ` Johannes Schindelin
2016-01-12  7:57       ` [PATCH v4 3/4] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2016-01-13  0:55         ` Ramsay Jones
2016-01-13  7:40           ` Johannes Schindelin
2016-01-13 16:44             ` Ramsay Jones
2016-01-12  7:57       ` [PATCH v4 4/4] t0060: verify that basename() and dirname() work as expected Johannes Schindelin
2016-01-13  0:58         ` Ramsay Jones
2016-01-13  7:17           ` Johannes Schindelin
     [not found]         ` <5695E4FB.2060705@web.de>
2016-01-13  9:27           ` Johannes Schindelin
2016-01-13 16:46             ` Ramsay Jones
2016-01-13 16:34           ` Ramsay Jones
2016-01-13 17:20             ` Junio C Hamano
2016-01-13 18:53               ` Johannes Schindelin
2016-01-13  0:44       ` [PATCH v4 0/4] Ensure that we can build without libgen.h Ramsay Jones
2016-01-13  2:56         ` Junio C Hamano
2016-01-13  6:15           ` Torsten Bögershausen
2016-01-13  7:38             ` Johannes Schindelin
2016-01-13  7:02         ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56A6980C.6040701@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.