From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 04/18] date.c: mark file-local function static
Date: Mon, 11 Jan 2010 23:52:47 -0800 [thread overview]
Message-ID: <1263282781-25596-5-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1263282781-25596-1-git-send-email-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* Has a trivial conflict in git-compat-util.h when applyed to 'pu'
date.c | 2 +-
git-compat-util.h | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/date.c b/date.c
index 5d05ef6..45f3684 100644
--- a/date.c
+++ b/date.c
@@ -9,7 +9,7 @@
/*
* This is like mktime, but without normalization of tm_wday and tm_yday.
*/
-time_t tm_to_time_t(const struct tm *tm)
+static time_t tm_to_time_t(const struct tm *tm)
{
static const int mdays[] = {
0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
diff --git a/git-compat-util.h b/git-compat-util.h
index 5c59687..85dea12 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -198,7 +198,6 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)))
extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
extern int prefixcmp(const char *str, const char *prefix);
-extern time_t tm_to_time_t(const struct tm *tm);
static inline const char *skip_prefix(const char *str, const char *prefix)
{
--
1.6.6.280.ge295b7.dirty
next prev parent reply other threads:[~2010-01-12 7:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-12 7:52 [PATCH 00/18] mark file-local symbols static Junio C Hamano
2010-01-12 7:52 ` [PATCH 01/18] bisect.c: mark file-local function static Junio C Hamano
2010-01-12 7:52 ` [PATCH 02/18] builtin-rev-list.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 03/18] pretty.c: " Junio C Hamano
2010-01-12 7:52 ` Junio C Hamano [this message]
2010-01-12 8:37 ` [PATCH 04/18] date.c: " Johannes Sixt
2010-01-12 9:05 ` Junio C Hamano
2010-01-12 9:43 ` Johannes Sixt
2010-01-12 7:52 ` [PATCH 05/18] http.c: mark file-local functions static Junio C Hamano
2010-01-12 7:52 ` [PATCH 06/18] entry.c: mark file-local function static Junio C Hamano
2010-01-12 7:52 ` [PATCH 07/18] parse-options.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 08/18] read-cache.c: mark file-local functions static Junio C Hamano
2010-01-12 7:52 ` [PATCH 09/18] remote-curl.c: mark file-local function static Junio C Hamano
2010-01-12 7:52 ` [PATCH 10/18] quote.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 11/18] submodule.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 12/18] utf8.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 13/18] mailmap.c: remove unused function Junio C Hamano
2010-01-12 7:52 ` [PATCH 14/18] sha1_file.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 15/18] strbuf.c: " Junio C Hamano
2010-01-12 7:52 ` [PATCH 16/18] blob.c: " Junio C Hamano
2010-01-12 17:37 ` Daniel Barkalow
2010-01-13 6:56 ` Junio C Hamano
2010-01-12 7:53 ` [PATCH 17/18] object.c: remove unused functions Junio C Hamano
2010-01-12 7:53 ` [PATCH 18/18] symlinks.c: " Junio C Hamano
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=1263282781-25596-5-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).