Merge branch 'busybox' into merge

2 files changed, 7 insertions, 0 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 7077f0e0d..32f4c4126 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -316,6 +316,7 @@ typedef unsigned long uoff_t;
 /* scary. better ideas? (but do *test* them first!) */
 #define OFF_T_MAX  ((off_t)~((off_t)1 << (sizeof(off_t)*8-1)))
 /* Users report bionic to use 32-bit off_t even if LARGEFILE support is requested.
+ * On musl, !ENABLE_LFS on 32-bit arches thinks that off_t is 32-bit.
  * We misdetected that. Don't let it build:
  */
 struct BUG_off_t_size_is_misdetected {
@@ -1428,8 +1429,10 @@ static inline void __attribute__ ((deprecated("use bb_simple_info_msg instead"))
 #define bb_perror_msg_and_die(...) BB_MSG(_perror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
 #define bb_herror_msg(...)         BB_MSG(_herror_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
 #define bb_herror_msg_and_die(...) BB_MSG(_herror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
+#if ENABLE_FEATURE_SYSLOG_INFO
 #define bb_info_msg(...)           BB_MSG(_info_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
 #endif
+#endif
 
 /* We need to export XXX_main from libbusybox
  * only if we build "individual" binaries
diff --git a/include/platform.h b/include/platform.h
index afd8cf292..f1c09c4d2 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -39,6 +39,10 @@
 # endif
 #endif
 
+#if !__GNUC_PREREQ(5,0)
+# define deprecated(msg) deprecated
+#endif
+
 #undef inline
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ > 199901L
 /* it's a keyword */