summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfergus.henderson <fergushenderson@users.noreply.github.com>2010-03-02 08:10:17 +0000
committerfergus.henderson <fergushenderson@users.noreply.github.com>2010-03-02 08:10:17 +0000
commit73cdca6497b37492163431be1f6db5e672fce331 (patch)
tree143e80a1306392fbd5776508fcd1a99cf27232d4
parented40329cac2f2114b29e535a57eb2f6831fb2f93 (diff)
downloaddistcc-git-73cdca6497b37492163431be1f6db5e672fce331.tar.gz
Apply patch from Akim Demaille <demaille@gostai.com>:
* src/hosts.c (strndup): Use the standard signature (without static), so that we don't conflict with GCC's builtin signature. Now that it is not static, declare it, to avoid warnings.
-rw-r--r--ChangeLog6
-rw-r--r--src/hosts.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3014ad4..6422299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-11 Akim Demaille <demaille@gostai.com>
+
+ * src/hosts.c (strndup): Use the standard signature (without
+ static), so that we don't conflict with GCC's builtin signature.
+ Now that it is not static, declare it, to avoid warnings.
+
2008-12-02 21:44 Fergus Henderson <opensource@google.com>
* Makefile.in, NEWS, configure.ac, include_server/setup.py:
diff --git a/src/hosts.c b/src/hosts.c
index 2ca00d0..bdfdf31 100644
--- a/src/hosts.c
+++ b/src/hosts.c
@@ -2,7 +2,7 @@
*
* distcc -- A simple distributed compiler system
*
- * Copyright (C) 2002, 2003, 2004 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 2002, 2003, 2004, 2009 by Martin Pool <mbp@samba.org>
* Copyright 2004 Google Inc.
*
* This program is free software; you can redistribute it and/or
@@ -131,7 +131,8 @@ int dcc_compare_container(const void *a, const void *b);
*
* Really this needs to be in util.c, but it's only used here.
**/
-static char *strndup(const char *src, size_t size)
+char *strndup(const char *src, size_t size);
+char *strndup(const char *src, size_t size)
{
char *dst;