Module Name: src
Committed By: he
Date: Sat Feb 4 14:56:58 UTC 2012
Modified Files:
src/external/bsd/ntp/dist/include: ntp_stdlib.h
Log Message:
Re-define emalloc(arg) to ntp_emalloc(arg), so that this can be linked
statically on NetBSD as well, since emalloc() conflicts with the entry
on our -lutil.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/include/ntp_stdlib.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/include/ntp_stdlib.h
diff -u src/external/bsd/ntp/dist/include/ntp_stdlib.h:1.3 src/external/bsd/ntp/dist/include/ntp_stdlib.h:1.4
--- src/external/bsd/ntp/dist/include/ntp_stdlib.h:1.3 Wed Feb 1 07:46:21 2012
+++ src/external/bsd/ntp/dist/include/ntp_stdlib.h Sat Feb 4 14:56:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_stdlib.h,v 1.3 2012/02/01 07:46:21 kardel Exp $ */
+/* $NetBSD: ntp_stdlib.h,v 1.4 2012/02/04 14:56:58 he Exp $ */
/*
* ntp_stdlib.h - Prototypes for NTP lib.
@@ -90,6 +90,7 @@ extern u_int32 addr2refid (sockaddr_u *)
#ifndef EREALLOC_CALLSITE /* ntp_malloc.h defines */
extern void * ereallocz (void *, size_t, size_t, int);
#define erealloczsite(p, n, o, z, f, l) ereallocz(p, n, o, (z))
+#define emalloc(arg) ntp_emalloc(arg)
extern void * emalloc (size_t);
#define emalloc_zero(c) ereallocz(NULL, (c), 0, TRUE)
#define erealloc(p, c) ereallocz(p, (c), 0, FALSE)
