Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/ntp/dist/include Re-define emalloc(arg) to ntp_...



details:   https://anonhg.NetBSD.org/src/rev/7848e037827c
branches:  trunk
changeset: 773504:7848e037827c
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 04 14:56:58 2012 +0000

description:
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.

diffstat:

 external/bsd/ntp/dist/include/ntp_stdlib.h |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 730f99cac3ad -r 7848e037827c external/bsd/ntp/dist/include/ntp_stdlib.h
--- a/external/bsd/ntp/dist/include/ntp_stdlib.h        Sat Feb 04 10:32:11 2012 +0000
+++ b/external/bsd/ntp/dist/include/ntp_stdlib.h        Sat Feb 04 14:56:58 2012 +0000
@@ -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 @@
 #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)



Home | Main Index | Thread Index | Old Index