[Bug 1193] Compile error: conflicting types for emalloc

bk: 4a159ebcTdNvtQ6PpkIk7JeuRG9QMQ

diff --git a/ChangeLog b/ChangeLog
index be25624a418edc0d0c466e8ebdb2028acdba8be6..0b96a8b247ef76567c8c24551f7fbbcfae1f3a96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Bug [1193] Compile error: conflicting types for emalloc
 (4.2.5p178) 2009/05/21 Released by Harlan Stenn <stenn@ntp.org>
 * Provide erealloc() and estrdup(), a la emalloc().
 * Improve ntp.conf's parser error messages.

diff --git a/libntp/emalloc.c b/libntp/emalloc.c
index 7a46739b150596cedcb5a3970b16bf5840e2ea9f..0bdf102a8aa437edff3e51a1fcdb66842841e7b7 100644 (file)
--- a/libntp/emalloc.c
+++ b/libntp/emalloc.c
@@ -31,7 +31,7 @@ erealloc(
 
 void *
 emalloc(
-       u_int   size
+       size_t  size
        )
 {
        return erealloc(NULL, size);
@@ -49,9 +49,9 @@ estrdup(
 
        if (NULL == copy) {
                msyslog(LOG_ERR, 
-                       "fatal out of memory duplicating %d byte "
+                       "fatal out of memory duplicating %u byte "
                        "string '%s'",
-                       strlen(str) + 1, str);
+                       (u_int)strlen(str) + 1, str);
                exit(1);
        }