2871. [bug] Type mismatch in mem_api.c between the definition and

			the header file, causing build failure with
			--enable-exportlib. [RT #21138]

9.8.0 and 9.7.1.

diff --git a/CHANGES b/CHANGES
index 74314333d7e86af614f89ff9a9cdf44d49e28fc9..abd2a5c1407d6bc834731b698bb4a0d5fe47d66a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2871.  [bug]           Type mismatch in mem_api.c between the definition and
+                       the header file, causing build failure with
+                       --enable-exportlib. [RT #21138]
+
 2870.  [maint]         Add AAAA address for L.ROOT-SERVERS.NET.
 
 2869.  [bug]           Fix arguments to dns_keytable_findnextkeynode() call.

diff --git a/lib/isc/mem_api.c b/lib/isc/mem_api.c
index 470c820124f2af2d1283097f4799b36552f00edb..f2f77f08b81329666145ac5bfa03bc35b5f27c49 100644 (file)
--- a/lib/isc/mem_api.c
+++ b/lib/isc/mem_api.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */
+/* $Id: mem_api.c,v 1.6 2010/04/09 06:09:35 jinmei Exp $ */
 
 #include <config.h>
 
@@ -25,7 +25,7 @@
 
 #if ISC_MEM_TRACKLINES
 #define FLARG_PASS     , file, line
-#define FLARG          , const char *file, int line
+#define FLARG          , const char *file, unsigned int line
 #else
 #define FLARG_PASS
 #define FLARG