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 770e144398754f13dc357c85f1f8a9dd74778c9c..d5e5782c5203420512e00bad85c1fa0961d66aca 100644 (file)
--- 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 7830e64433da751193b533d125e9b5810f58cef3..e68c1f906d6cdf4fd2d23740a90a6e71bc35d56e 100644 (file)
--- 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 7f2a454ccf1ced12f850137aa013dccb71ab9176..d4fe48530f0def6a6df3f21b0702a47e9aa45d9f 100644 (file)
--- 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,
 /**/