ustr: Fix "__va_copy not defined" build warnings.

2 files changed, 28 insertions, 1 deletions

diff --git a/recipes-security/ustr/ustr/ustr-fix__va_copy-not-defined.patch b/recipes-security/ustr/ustr/ustr-fix__va_copy-not-defined.patch
new file mode 100644
index 0000000..cd5ef87
--- /dev/null
+++ b/recipes-security/ustr/ustr/ustr-fix__va_copy-not-defined.patch
@@ -0,0 +1,26 @@
+From c35a8949e305666ffe7fdc89f7cf506c6e6821d0 Mon Sep 17 00:00:00 2001
+From: Xin Ouyang <Xin.Ouyang@windriver.com>
+Date: Fri, 3 Feb 2012 11:28:21 +0800
+Subject: [PATCH] Fix "__va_copy" not defined warning.
+
+ustr-compiler.h:19:16: warning: "__va_copy" is not defined [-Wundef]
+---
+ ustr-compiler.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ustr-compiler.h b/ustr-compiler.h
+index 9e71276..642e6e8 100644
+--- a/ustr-compiler.h
++++ b/ustr-compiler.h
+@@ -16,7 +16,7 @@
+ #ifdef va_copy
+ # define USTR_CONF_HAVE_VA_COPY 1
+ # define USTR__VA_COPY(x, y)   va_copy(x, y)
+-#elif __va_copy
++#elif defined(__va_copy)
+ # define USTR_CONF_HAVE_VA_COPY 1
+ # define USTR__VA_COPY(x, y) __va_copy(x, y)
+ #else
+-- 
+1.7.5.4
+
diff --git a/recipes-security/ustr/ustr_1.0.4.bb b/recipes-security/ustr/ustr_1.0.4.bb
index 5cef95d..e2b45b1 100644
--- a/recipes-security/ustr/ustr_1.0.4.bb
+++ b/recipes-security/ustr/ustr_1.0.4.bb
@@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c79c6e2ae13418d16d7dc82df960a1e7 \
                     file://LICENSE_MIT;md5=c61e779b782608472bd87593c3c3916f"
 
 SRC_URI = "http://www.and.org/ustr/1.0.4/ustr-1.0.4.tar.bz2 \
-    file://ustr-makefile-fix.patch;patch=1"
+    file://ustr-makefile-fix.patch;patch=1 \
+    file://ustr-fix__va_copy-not-defined.patch;patch=2"
 SRC_URI[md5sum] = "93147d9f0c9765d4cd0f04f7e44bdfce"
 SRC_URI[sha256sum] = "3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4"