From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 25 Feb 2020 20:26:49 +0000 (+0100)
Subject: patch 8.2.0315: build failure on HP-UX system
X-Git-Tag: v8.2.0315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c593bec4120f122e8a9129ec461968f1bd214435;p=vim

patch 8.2.0315: build failure on HP-UX system

Problem:    Build failure on HP-UX system.
Solution:   Use LONG_LONG_MIN instead of LLONG_MIN.  Add type casts for switch
            statement. (John Marriott)
---

diff --git a/src/json.c b/src/json.c
index 770e14439..d5e5782c5 100644
--- a/src/json.c
+++ b/src/json.c
@@ -194,7 +194,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options)
     switch (val->v_type)
     {
 	case VAR_BOOL:
-	    switch (val->vval.v_number)
+	    switch ((long)val->vval.v_number)
 	    {
 		case VVAL_FALSE: ga_concat(gap, (char_u *)"false"); break;
 		case VVAL_TRUE: ga_concat(gap, (char_u *)"true"); break;
@@ -202,7 +202,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options)
 	    break;
 
 	case VAR_SPECIAL:
-	    switch (val->vval.v_number)
+	    switch ((long)val->vval.v_number)
 	    {
 		case VVAL_NONE: if ((options & JSON_JS) != 0
 					     && (options & JSON_NO_NONE) == 0)
diff --git a/src/structs.h b/src/structs.h
index 7830e6443..e68c1f906 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1279,9 +1279,15 @@ typedef long_u hash_T;		// Type for hi_hash
 #else
   typedef long long		varnumber_T;
   typedef unsigned long long	uvarnumber_T;
-# define VARNUM_MIN		LLONG_MIN
-# define VARNUM_MAX		LLONG_MAX
-# define UVARNUM_MAX		ULLONG_MAX
+# ifdef LLONG_MIN
+#  define VARNUM_MIN		LLONG_MIN
+#  define VARNUM_MAX		LLONG_MAX
+#  define UVARNUM_MAX		ULLONG_MAX
+# else
+#  define VARNUM_MIN		LONG_LONG_MIN
+#  define VARNUM_MAX		LONG_LONG_MAX
+#  define UVARNUM_MAX		ULONG_LONG_MAX
+# endif
 #endif
 
 typedef double	float_T;
diff --git a/src/version.c b/src/version.c
index 7f2a454cc..d4fe48530 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    315,
 /**/
     314,
 /**/