Merge pull request #521 from svaarala/v1.4.0-release-prep-fixes

Minor fixes in 1.4.0 release preparation

RELEASES.rst

@@ -1177,7 +1177,7 @@ Released
   by the compiler, but an existing "intermediate value" referred to a const
   instead of a register value (GH-449)
 
-1.4.0 (2016-01-09)
+1.4.0 (2016-01-10)
 ------------------
 
 * Add support for using C++ exceptions instead of setjmp()/longjmp() to

examples/cmdline/duk_cmdline.c

@@ -16,18 +16,15 @@
     defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
 /* Suppress warnings about plain fopen() etc. */
 #define _CRT_SECURE_NO_WARNINGS
-/* Add missing snprintf(); not same NUL termination but we don't rely on it. */
-#define snprintf _snprintf
-#endif
-
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
 /* Workaround for snprintf() missing in older MSVC versions.
  * Note that _snprintf() may not NUL terminate the string, but
  * this difference does not matter here as a NUL terminator is
  * always explicitly added.
  */
 #define snprintf _snprintf
 #endif
+#endif
 
 #define  GREET_CODE(variant)  \
 	"print('((o) Duktape" variant " ' + " \

util/combine_src.py

@@ -153,7 +153,7 @@ def createCombined(files, extinc, intinc, duk_version, git_commit, git_describe,
 	duk_patch = duk_version % 100
 	res.append('/*')
 	res.append(' *  Single source autogenerated distributable for Duktape %d.%d.%d.' % (duk_major, duk_minor, duk_patch))
-	res.append('')
+	res.append(' *')
 	res.append(' *  Git commit %s (%s).' % (git_commit, git_describe))
 	res.append(' *  Git branch %s.' % git_branch)
 	res.append(' *')