add php-pgsql and php-fpm (#875)

[termux-packages] / ndk_patches / syslog.patch

diff --git a/ndk_patches/syslog.patch b/ndk_patches/syslog.patch
index ab2dd04..67a1dc6 100644 (file)
--- a/ndk_patches/syslog.patch
+++ b/ndk_patches/syslog.patch
@@ -10,27 +10,26 @@ diff -Nur /Users/fornwall/lib/android-ndk/platforms/android-18/arch-arm/usr/incl
  
  __BEGIN_DECLS
  
-@@ -111,6 +112,65 @@
+@@ -111,6 +112,64 @@
  extern void   syslog_r(int, struct syslog_data *, const char *, ...);
  extern void   vsyslog_r(int, struct syslog_data *, const char *, va_list);
  
 +extern /*const*/ char* __progname;
-+static void android_polyfill_openlog(const char* a, int b, int c) {
++static __inline__ void android_polyfill_openlog(const char* a, int b, int c) {
 +      (void) a;
 +      (void) b;
 +      (void) c;
 +}
-+static void android_polyfill_closelog() {}
++static __inline__ void android_polyfill_closelog() {}
 +
-+static void android_polyfill_vsyslog(int syslog_priority, char const* format, va_list ap)
++static __inline__ void android_polyfill_vsyslog(int syslog_priority, char const* format, va_list ap)
 +{
-+      android_LogPriority a = ANDROID_LOG_FATAL;
++      android_LogPriority a = ANDROID_LOG_ERROR;
 +      switch (syslog_priority) {
-+              case LOG_INFO           : a = ANDROID_LOG_SILENT        ; break;
-+              case LOG_EMERG          : a = ANDROID_LOG_FATAL         ; break;
-+              case LOG_ERR            : a = ANDROID_LOG_ERROR         ; break;
-+              case LOG_WARNING        : a = ANDROID_LOG_WARN          ; break;
-+              case LOG_DEBUG  : a = ANDROID_LOG_VERBOSE       ; break;
++              case LOG_WARNING: a = ANDROID_LOG_WARN; break;
++              case LOG_NOTICE : a = ANDROID_LOG_INFO; break;
++              case LOG_INFO: a = ANDROID_LOG_INFO; break;
++              case LOG_DEBUG: a = ANDROID_LOG_DEBUG; break;
 +      }
 +      char* syslog_text;
 +      if (vasprintf(&syslog_text, format, ap) == -1) {
@@ -41,7 +40,7 @@ diff -Nur /Users/fornwall/lib/android-ndk/platforms/android-18/arch-arm/usr/incl
 +      free(syslog_text);
 +}
 +
-+static void android_polyfill_syslog(int priority, const char* format, ...)
++static __inline__ void android_polyfill_syslog(int priority, const char* format, ...)
 +{
 +      va_list myargs;
 +      va_start(myargs, format);
@@ -49,7 +48,7 @@ diff -Nur /Users/fornwall/lib/android-ndk/platforms/android-18/arch-arm/usr/incl
 +      va_end(myargs);
 +}
 +
-+static void android_polyfill_syslog_r(int syslog_priority, struct syslog_data* d, const char* format, ...)
++static __inline__ void android_polyfill_syslog_r(int syslog_priority, void* d, const char* format, ...)
 +{
 +      (void) d;
 +      va_list myargs;
@@ -58,7 +57,7 @@ diff -Nur /Users/fornwall/lib/android-ndk/platforms/android-18/arch-arm/usr/incl
 +      va_end(myargs);
 +}
 +
-+static void android_polyfill_vsyslog_r(int syslog_priority, struct syslog_data* d, const char* fmt, va_list ap)
++static __inline__ void android_polyfill_vsyslog_r(int syslog_priority, void* d, const char* fmt, va_list ap)
 +{
 +      (void) d;
 +      android_polyfill_vsyslog(syslog_priority, fmt, ap);