From: Peter Colberg <peter@colberg.org>
Date: Sun, 31 Jul 2016 03:20:28 +0000 (-0400)
Subject: Imported Upstream version 2.0.2
X-Git-Tag: archive/raspbian/2.11.3-2+rpi1^2~10^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=497deb7a7ea614e02a6b1ed28e120f87235b9218;p=utf8proc.git

Imported Upstream version 2.0.2
---

diff --git a/.travis.yml b/.travis.yml
index b871b47..7a53b59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,4 @@ script:
 env:
     # use JuliaLang caching (https://github.com/staticfloat/cache.julialang.org)
     # so that Travis builds do not depend on anyone's flaky servers but our own
-    - URLCACHE=https://cache.julialang.org/ CFLAGS="-O2 -Werror"
+    - URLCACHE=https://cache.julialang.org/ CFLAGS="-O2 -Werror -Wmissing-prototypes"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8958bcd..5e9b8a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,10 +6,12 @@ disallow_intree_builds()
 
 project (utf8proc C)
 
-# Be sure to also update these in Makefile!
+# This is the ABI version number, which may differ from the
+# API version number (defined in utf8proc.h).
+# Be sure to also update these in Makefile and MANIFEST!
 set(SO_MAJOR 2)
 set(SO_MINOR 0)
-set(SO_PATCH 1)
+set(SO_PATCH 2)
 
 add_definitions (
   -DUTF8PROC_EXPORTS
diff --git a/MANIFEST b/MANIFEST
index 0be40e0..106a4f0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2,6 +2,6 @@ include/
 include/utf8proc.h
 lib/
 lib/libutf8proc.a
-lib/libutf8proc.so -> libutf8proc.so.2.0.1
-lib/libutf8proc.so.2 -> libutf8proc.so.2.0.1
-lib/libutf8proc.so.2.0.1
+lib/libutf8proc.so -> libutf8proc.so.2.0.2
+lib/libutf8proc.so.2 -> libutf8proc.so.2.0.2
+lib/libutf8proc.so.2.0.2
diff --git a/Makefile b/Makefile
index 1179748..2bde4b1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,18 @@ FIND=find
 CFLAGS ?= -O2
 PICFLAG = -fPIC
 C99FLAG = -std=c99
-WCFLAGS = -Wall -Wmissing-prototypes -pedantic
+WCFLAGS = -Wall -pedantic
 UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS
 
 # shared-library version MAJOR.MINOR.PATCH ... this may be *different*
 # from the utf8proc version number because it indicates ABI compatibility,
 # not API compatibility: MAJOR should be incremented whenever *binary*
-# compatibility is broken, even if the API is backward-compatible
-# Be sure to also update these in MANIFEST and CMakeLists.txt!
+# compatibility is broken, even if the API is backward-compatible.
+# The API version number is defined in utf8proc.h.
+# Be sure to also update these ABI versions in MANIFEST and CMakeLists.txt!
 MAJOR=2
 MINOR=0
-PATCH=1
+PATCH=2
 
 OS := $(shell uname)
 ifeq ($(OS),Darwin) # MacOS X
diff --git a/NEWS.md b/NEWS.md
index ec8108e..6f4c131 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,17 @@
 # utf8proc release history #
 
+## Version 2.0.2 ##
+
+2016-07-27:
+
+- Move `-Wmissing-prototypes` warning flag from `Makefile` to `.travis.yml`
+  since MSVC does not understand this flag and it is occasionally useful to
+  build using MSVC through the `Makefile` ([#79]).
+
+- Use a different variable name for a nested loop in `bench/bench.c`, and
+  declare it in a C89 way rather than inside the `for` to avoid "error:
+  'for' loop initial declarations are only allowed in C99 mode" ([#80]).
+
 ## Version 2.0.1 ##
 
 2016-07-13:
diff --git a/bench/bench.c b/bench/bench.c
index 21685c5..4932c6d 100644
--- a/bench/bench.c
+++ b/bench/bench.c
@@ -7,7 +7,7 @@
 
 int main(int argc, char **argv)
 {
-	 int i;
+	 int i, j;
 	 int options = 0;
 	 
 	 for (i = 1; i < argc; ++i) {
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 		  }
 		  uint8_t *dest;
 		  mytime start = gettime();
-		  for (int i = 0; i < 100; ++i) {
+		  for (j = 0; j < 100; ++j) {
 			   utf8proc_map(src, len, &dest, options);
 			   free(dest);
 		  }
diff --git a/utf8proc.h b/utf8proc.h
index 42ab25d..82c0902 100644
--- a/utf8proc.h
+++ b/utf8proc.h
@@ -22,7 +22,7 @@
  */
 
 
-/** 
+/**
  * @mainpage
  *
  * utf8proc is a free/open-source (MIT/expat licensed) C library
@@ -54,7 +54,7 @@
 #define UTF8PROC_H
 
 /** @name API version
- *  
+ *
  * The utf8proc API version MAJOR.MINOR.PATCH, following
  * semantic-versioning rules (http://semver.org) based on API
  * compatibility.
@@ -63,7 +63,8 @@
  * runtime version may append a string like "-dev" to the version number
  * for prerelease versions.
  *
- * @note The shared-library version number in the Makefile may be different,
+ * @note The shared-library version number in the Makefile
+ *       (and CMakeLists.txt, and MANIFEST) may be different,
  *       being based on ABI compatibility rather than API compatibility.
  */
 /** @{ */
@@ -72,7 +73,7 @@
 /** The MINOR version number (increased when new functionality is added in a backwards-compatible manner). */
 #define UTF8PROC_VERSION_MINOR 0
 /** The PATCH version (increased for fixes that do not change the API). */
-#define UTF8PROC_VERSION_PATCH 1
+#define UTF8PROC_VERSION_PATCH 2
 /** @} */
 
 #include <stdlib.h>