summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2020-11-09 02:03:29 +0100
committerSebastian Pipping <sebastian@pipping.org>2020-11-09 02:03:29 +0100
commit9e1fba08c231f1990fdee13545ab3a0ac804bd3c (patch)
tree9f792c91ba1fbc609f774de1eda601807470d41f
parent1bd8ae2b8b47d3155765c1ea282a8f9812d3853e (diff)
parentd1081dcfe6be36950dcdeeee8fa2b27d02b0b1c7 (diff)
downloaduriparser-9e1fba08c231f1990fdee13545ab3a0ac804bd3c.tar.gz
Merge branch 'jensenrichardson-patch-1' (#93)
-rw-r--r--ChangeLog3
-rw-r--r--THANKS1
-rw-r--r--include/uriparser/UriDefsConfig.h2
3 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 23aa1a8..e92a9f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ NOTE: uriparser is looking for help with a few things:
* Fixed: MinGW: Fix name of static library (GitHub #90)
Thanks to SpaceIm for the patch and Sandro Mani for review!
+ * Fixed: Use correct inline marker "__forceinline" for Intel C++ Compiler
+ (GitHub #93)
+ Thanks to jensenrichardson for the patch!
* Improved: pkg-config: Use ${prefix} and ${exec_prefix} to ease
overriding variables using --define-variable=NAME=VALUE,
e.g. as done on OpenWRT (GitHub #91)
diff --git a/THANKS b/THANKS
index ca7eccb..edc56f7 100644
--- a/THANKS
+++ b/THANKS
@@ -22,6 +22,7 @@ Friedrich Delgado Friedrichs
Gary Mazzaferro
Graham Percival
Harvey Vrsalovic
+jensenrichardson
Jerome Custodio
Joel Cunningham
Jørgen Ibsen
diff --git a/include/uriparser/UriDefsConfig.h b/include/uriparser/UriDefsConfig.h
index 392229a..6262b8c 100644
--- a/include/uriparser/UriDefsConfig.h
+++ b/include/uriparser/UriDefsConfig.h
@@ -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 */