* hash/hash_bigkey.c (collect_key, collect_data): Cast malloc

	return value to correct types. (raeburn@cygnus.com)

	* obj/Makefile.in (check): Set srcdir in environment.
	(raeburn@cygnus.com)

	* configure.in (AC_COMPILE_TYPE): replacment for AC_CHECK_TYPE
	that uses AC_TRY_COMPILE instead of AC_EGREP_CPP.  For now, only
	use it for the int32 types (where AC_CHECK_TYPE gets the wrong
	result on __CYGWIN32__) and plan that AC_CHECK_TYPE itself gets
	repaired. (Fix by eichin@cygnus.com)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10351 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/db2/ChangeLog b/src/util/db2/ChangeLog
index 41774ba89bca50e84173af05a58bfb1828444ae3..7bd6da56528d69d23640006ef9a8d3120087e0c4 100644 (file)
--- a/src/util/db2/ChangeLog
+++ b/src/util/db2/ChangeLog
@@ -1,3 +1,18 @@
+Thu Jan 15 11:34:13 1998  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * hash/hash_bigkey.c (collect_key, collect_data): Cast malloc
+       return value to correct types. (raeburn@cygnus.com)
+
+       * obj/Makefile.in (check): Set srcdir in environment.
+       (raeburn@cygnus.com)
+
+       * configure.in (AC_COMPILE_TYPE): replacment for AC_CHECK_TYPE
+       that uses AC_TRY_COMPILE instead of AC_EGREP_CPP.  For now, only
+       use it for the int32 types (where AC_CHECK_TYPE gets the wrong
+       result on __CYGWIN32__) and plan that AC_CHECK_TYPE itself gets
+       repaired. (Fix by eichin@cygnus.com)
+
+
 Sun Dec 21 18:33:14 1997  Tom Yu  <tlyu@mit.edu>
 
        * hash/dbm.c: Rename the errno member of HTAB.

diff --git a/src/util/db2/configure.in b/src/util/db2/configure.in
index a323bbfab3744349c39de7ccc7695308564d393a..3f6c5c08650b64c7844838865e9f6a878d2059b8 100644 (file)
--- a/src/util/db2/configure.in
+++ b/src/util/db2/configure.in
@@ -34,6 +34,21 @@ AC_CHECK_HEADERS(unistd.h)
 dnl checks for typedefs
 AC_TYPE_SIZE_T
 
+dnl AC_COMPILE_TYPE(TYPE, DEFAULT)
+define(AC_COMPILE_TYPE,
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#endif], [$1 test_variable;], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
+AC_MSG_RESULT($ac_cv_type_$1)
+if test $ac_cv_type_$1 = no; then
+  AC_DEFINE($1, $2)
+fi
+])
+
 AC_CHECK_TYPE(ssize_t, int)
 
 AC_CHECK_TYPE(u_char, unsigned char)
@@ -45,8 +60,8 @@ AC_CHECK_TYPE(int8_t, signed char)
 AC_CHECK_TYPE(u_int8_t, unsigned char)
 AC_CHECK_TYPE(int16_t, short)
 AC_CHECK_TYPE(u_int16_t, unsigned short)
-AC_CHECK_TYPE(int32_t, int)
-AC_CHECK_TYPE(u_int32_t, unsigned int)
+AC_COMPILE_TYPE(int32_t, int)
+AC_COMPILE_TYPE(u_int32_t, unsigned int)
 
 dnl checks for structures
 dnl checks for compiler characteristics

diff --git a/src/util/db2/hash/hash_bigkey.c b/src/util/db2/hash/hash_bigkey.c
index 689dc3db64a95467d06311e6bf86fbb1ef967b75..06210a57ccc94a31867f49ec23903f67321283b0 100644 (file)
--- a/src/util/db2/hash/hash_bigkey.c
+++ b/src/util/db2/hash/hash_bigkey.c
@@ -386,7 +386,7 @@ collect_key(hashp, pagep, len, last_page)
                totlen = len + BIGKEYLEN(pagep);
                if (hashp->bigkey_buf)
                        free(hashp->bigkey_buf);
-               hashp->bigkey_buf = (char *)malloc(totlen);
+               hashp->bigkey_buf = (u_int8_t *)malloc(totlen);
                if (!hashp->bigkey_buf)
                        return (-1);
                memcpy(hashp->bigkey_buf + len,
@@ -400,7 +400,7 @@ collect_key(hashp, pagep, len, last_page)
        if (BIGKEYLEN(pagep) == 0) {
                if (hashp->bigkey_buf)
                        free(hashp->bigkey_buf);
-               hashp->bigkey_buf = (char *)malloc(len);
+               hashp->bigkey_buf = (u_int8_t *)malloc(len);
                return (hashp->bigkey_buf ? len : -1);
        }
        totlen = len + BIGKEYLEN(pagep);
@@ -453,7 +453,7 @@ collect_data(hashp, pagep, len)
                if (hashp->bigdata_buf)
                        free(hashp->bigdata_buf);
                totlen = len + BIGDATALEN(pagep);
-               hashp->bigdata_buf = (char *)malloc(totlen);
+               hashp->bigdata_buf = (u_int8_t *)malloc(totlen);
                if (!hashp->bigdata_buf)
                        return (-1);
                memcpy(hashp->bigdata_buf + totlen - BIGDATALEN(pagep),

diff --git a/src/util/db2/obj/Makefile.in b/src/util/db2/obj/Makefile.in
index 0c022e273dafac75c22e2b4c943f1354f2c3b240..b81a78efbf3069264bd4a2d305f66a5de67b0b65 100644 (file)
--- a/src/util/db2/obj/Makefile.in
+++ b/src/util/db2/obj/Makefile.in
@@ -53,7 +53,7 @@ dbtest: dbtest.o $(STRERROR_OBJ) $(LIBDB)
        $(CC) -o $@ dbtest.o $(STRERROR_OBJ) $(LIBDB)
 
 check:: dbtest
-       TMPDIR=$(TMPDIR) $(FCTSH) $(top_srcdir)/test/run.test
+       srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(FCTSH) $(top_srcdir)/test/run.test
 
 install::