diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/libqrencode/remove-deprecated-attribute.patch | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
Diffstat (limited to 'ports/libqrencode/remove-deprecated-attribute.patch')
| -rw-r--r-- | ports/libqrencode/remove-deprecated-attribute.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ports/libqrencode/remove-deprecated-attribute.patch b/ports/libqrencode/remove-deprecated-attribute.patch new file mode 100644 index 000000000..1a00c3a3b --- /dev/null +++ b/ports/libqrencode/remove-deprecated-attribute.patch @@ -0,0 +1,16 @@ + qrencode.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qrencode.h b/qrencode.h +index b855f0a..a6d4a29 100644 +--- a/qrencode.h ++++ b/qrencode.h +@@ -555,7 +555,7 @@ extern char *QRcode_APIVersionString(void); + /** + * @deprecated + */ +-extern void QRcode_clearCache(void) __attribute__ ((deprecated)); ++extern void QRcode_clearCache(void); + + #if defined(__cplusplus) + } |