__LA_DEAD is a private convention; don't publicize it.

Also, clean up leaks of a few other __LA_ symbols that
were introduced to make the public headers more portable.

SVN-Revision: 220

diff --git a/cpio/cpio_platform.h b/cpio/cpio_platform.h
index 314519829827a163de9c0b4ce467eeae5b10a1b1..c251fa439fd40eccf8da0461157ed9b8c832bde4 100644 (file)
--- a/cpio/cpio_platform.h
+++ b/cpio/cpio_platform.h
@@ -81,4 +81,12 @@
 #endif
 #endif
 
+/* How to mark functions that don't return. */
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+                          (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define __LA_DEAD       __attribute__((__noreturn__))
+#else
+#define __LA_DEAD
+#endif
+
 #endif /* !CPIO_PLATFORM_H_INCLUDED */

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 669ec5903d4c2fbc2f8bf919c70e34a8c9912762..34ba9d6d1545b28e7978d6078c2d652179927174 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -82,14 +82,6 @@
 # define __LA_DECL
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ > 2 || \
-                         (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
-#define        __LA_DEAD       __attribute__((__noreturn__))
-#else
-#define        __LA_DEAD
-#endif
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -598,5 +590,9 @@ __LA_DECL void               archive_copy_error(struct archive *dest,
 
 /* This is meaningless outside of this header. */
 #undef __LA_DECL
+#undef __LA_GID_T
+#undef __LA_INT64_T
+#undef __LA_SSIZE_T
+#undef __LA_UID_T
 
 #endif /* !ARCHIVE_H_INCLUDED */

diff --git a/libarchive/archive_private.h b/libarchive/archive_private.h
index 9e5d0dac0f3b5f5b6f92a9ff0735d69e6695cd71..df5fc7dea8ab9213ec9d741cd35d9ae779de5713 100644 (file)
--- a/libarchive/archive_private.h
+++ b/libarchive/archive_private.h
@@ -31,6 +31,13 @@
 #include "archive.h"
 #include "archive_string.h"
 
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+                         (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define        __LA_DEAD       __attribute__((__noreturn__))
+#else
+#define        __LA_DEAD
+#endif
+
 #define        ARCHIVE_WRITE_MAGIC     (0xb0c5c0deU)
 #define        ARCHIVE_READ_MAGIC      (0xdeb0c5U)
 #define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U)