summaryrefslogtreecommitdiff
path: root/include/uriparser
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2021-04-26 20:34:38 +0200
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2021-04-26 20:34:38 +0200
commit57be5b9e80075d32249105407879dd1d2bac460b (patch)
treef161e88bc941e1c861b1dd1a34a332f8cdc53f7a /include/uriparser
parentcf9293531802f491b4b145d98a4900e72a7d105b (diff)
parent7d4216c07bd36b69ae7f5eabb7b4d6b59166a508 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'include/uriparser')
-rw-r--r--include/uriparser/Uri.h2
-rw-r--r--include/uriparser/UriBase.h2
-rw-r--r--include/uriparser/UriDefsConfig.h8
-rw-r--r--include/uriparser/UriDefsUnicode.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/include/uriparser/Uri.h b/include/uriparser/Uri.h
index e822d33..44d8760 100644
--- a/include/uriparser/Uri.h
+++ b/include/uriparser/Uri.h
@@ -1,4 +1,4 @@
-/* 520782e6334595efe9dee874cfa720d7b49de30fa51caba8bce352e55f521ee1 (0.9.4+)
+/* 6db8b5726a796167bb96b3d83ff9ac6792a01474dbe3778deb3c2a25d60b3693 (0.9.5+)
*
* uriparser - RFC 3986 URI parsing library
*
diff --git a/include/uriparser/UriBase.h b/include/uriparser/UriBase.h
index 4147882..565abcf 100644
--- a/include/uriparser/UriBase.h
+++ b/include/uriparser/UriBase.h
@@ -55,7 +55,7 @@
/* Version */
#define URI_VER_MAJOR 0
#define URI_VER_MINOR 9
-#define URI_VER_RELEASE 4
+#define URI_VER_RELEASE 5
#define URI_VER_SUFFIX_ANSI ""
#define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)
diff --git a/include/uriparser/UriDefsConfig.h b/include/uriparser/UriDefsConfig.h
index 392229a..51bc93e 100644
--- a/include/uriparser/UriDefsConfig.h
+++ b/include/uriparser/UriDefsConfig.h
@@ -59,15 +59,15 @@
/* No encoding at all */
# error URI_NO_ANSI and URI_NO_UNICODE cannot go together.
# else
-/* Unicode only */
+/* Wide strings only */
# define URI_ENABLE_UNICODE 1
# endif
#else
# ifdef URI_NO_UNICODE
-/* ANSI only */
+/* Narrow strings only */
# define URI_ENABLE_ANSI 1
# else
-/* Both ANSI and Unicode */
+/* Both narrow and wide strings */
# define URI_ENABLE_ANSI 1
# define URI_ENABLE_UNICODE 1
# endif
@@ -82,7 +82,7 @@
/* Intel C/C++ */
/* http://predef.sourceforge.net/precomp.html#sec20 */
/* http://www.intel.com/support/performancetools/c/windows/sb/CS-007751.htm#2 */
-# define URI_INLINE __force_inline
+# define URI_INLINE __forceinline
#elif defined(_MSC_VER)
/* Microsoft Visual C++ */
/* http://predef.sourceforge.net/precomp.html#sec32 */
diff --git a/include/uriparser/UriDefsUnicode.h b/include/uriparser/UriDefsUnicode.h
index 08e4728..01421f5 100644
--- a/include/uriparser/UriDefsUnicode.h
+++ b/include/uriparser/UriDefsUnicode.h
@@ -39,7 +39,7 @@
/**
* @file UriDefsUnicode.h
- * Holds definitions for the Unicode pass.
+ * Holds definitions for the wide string pass.
* NOTE: This header is included N times, not once.
*/