summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-16 13:30:30 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-16 13:30:30 +1100
commit69371b511b998f2637fdf4bf708e15462162bc0d (patch)
tree8f5b641275a0448f0375b2d8b7f4ae4b6e1541c7
parent2563e3f2729b90b62cc0a53137a516d2f009dc53 (diff)
- (dtucker) [openbsd-compat/openbsd-compat.h] Fix prototypes, spotted by
Tim.
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/openbsd-compat.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ebe777032..55e8bb1d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 so we correctly detect whether or not we have a native user_from_uid. 3 so we correctly detect whether or not we have a native user_from_uid.
4 - (dtucker) [openbsd-compat/openbsd-compat.h] Prototypes for user_from_uid 4 - (dtucker) [openbsd-compat/openbsd-compat.h] Prototypes for user_from_uid
5 and group_from_gid. 5 and group_from_gid.
6 - (dtucker) [openbsd-compat/openbsd-compat.h] Fix prototypes, spotted by
7 Tim.
6 8
720100115 920100115
8 - (dtucker) OpenBSD CVS Sync 10 - (dtucker) OpenBSD CVS Sync
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index a38068d71..020032bc4 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openbsd-compat.h,v 1.47 2010/01/16 00:53:07 dtucker Exp $ */ 1/* $Id: openbsd-compat.h,v 1.48 2010/01/16 02:30:30 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved. 4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -201,11 +201,11 @@ int vsnprintf(char *, size_t, const char *, va_list);
201#endif 201#endif
202 202
203#ifndef HAVE_USER_FROM_UID 203#ifndef HAVE_USER_FROM_UID
204char *user_from_uid(uid_t); 204char *user_from_uid(uid_t, int);
205#endif 205#endif
206 206
207#ifndef HAVE_GROUP_FROM_GUID 207#ifndef HAVE_GROUP_FROM_GUID
208char *group_from_gid(gid_t); 208char *group_from_gid(gid_t, int);
209#endif 209#endif
210 210
211void *xmmap(size_t size); 211void *xmmap(size_t size);