Cleanups.

CVS patchset: 5768
CVS date: 2002/10/11 22:55:40

diff --git a/Doxyfile.in b/Doxyfile.in
index 66606ed..b5dafbe 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -399,8 +399,6 @@ INPUT                  = \
        @top_srcdir@/build/expression.c \
        @top_srcdir@/build/files.c \
        @top_srcdir@/build/misc.c \
-       @top_srcdir@/build/myftw.c \
-       @top_srcdir@/build/myftw.h \
        @top_srcdir@/build/names.c \
        @top_srcdir@/build/pack.c \
        @top_srcdir@/build/parseBuildInstallClean.c \

diff --git a/beecrypt/base64.h b/beecrypt/base64.h
index 44167a3..c18161e 100644 (file)
--- a/beecrypt/base64.h
+++ b/beecrypt/base64.h
@@ -74,7 +74,7 @@ char * b64encode (const void * data, size_t ns)
 /**
  * Encode crc of binary input data into 5 bytes of base64 output.
  * @param data         binary data
- * @param len          no. bytes of binary data
+ * @param ns           no. bytes of binary data
  * @return             (malloc'd) base64 string
  */
 BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/

diff --git a/build/files.c b/build/files.c
index 674db91..fa990f9 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1759,7 +1759,6 @@ fprintf(stderr, "*** flp->flags |= 0x%x\n", multiLib);
  * Add directory (and all of its files) to the package manifest.
  * @param fl           package file tree walk data
  * @param diskURL      path to file
- * @param statp                file stat (possibly NULL)
  * @return             0 on success
  */
 static int recurseDir(FileList fl, const char * diskURL)

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 2947bf3..0214618 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -393,6 +393,8 @@ typedef enum rpmTag_e {
     RPMTAG_CACHEPKGPATH                = 1137,
     RPMTAG_CACHEPKGSIZE                = 1138,
     RPMTAG_CACHEPKGMTIME       = 1139,
+    RPMTAG_FILECOLOR           = 1140,
+    RPMTAG_FILECLASS           = 1141,
 /*@-enummemuse@*/
     RPMTAG_FIRSTFREE_TAG       /*!< internal */
 /*@=enummemuse@*/

diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4
index 2211be0..b73a11f 100644 (file)
--- a/zlib/aclocal.m4
+++ b/zlib/aclocal.m4
@@ -2865,26 +2865,6 @@ linux-gnu*)
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
   dynamic_linker='GNU/Linux ld.so'
-
-  # Find out which ABI we are using (multilib Linux x86_64 hack).
-  libsuff=
-  case "$host_cpu" in
-  x86_64*)
-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-    if AC_TRY_EVAL(ac_compile); then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  *)
-    ;;
-  esac
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
   ;;
 
 netbsd*)
@@ -4068,7 +4048,7 @@ irix5* | irix6*)
 # This must be Linux ELF.
 linux-gnu*)
   case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* )
+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM