From b4c625d8d12749e163fd2bfe2a07d216437f915e Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 3 May 2017 17:27:57 -0400
Subject: [PATCH] jlif future proof for 64-bit json parser

---
 src/ioc/db/dbJLink.h     | 2 +-
 src/ioc/db/test/jlinkz.c | 2 +-
 src/std/link/lnkCalc.c   | 6 +++---
 src/std/link/lnkConst.c  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ioc/db/dbJLink.h b/src/ioc/db/dbJLink.h
index 8924c5d4a..61b59670b 100644
--- a/src/ioc/db/dbJLink.h
+++ b/src/ioc/db/dbJLink.h
@@ -62,7 +62,7 @@ typedef struct jlif {
     jlif_result (*parse_boolean)(jlink *, int val);
         /* Optional, parser saw a boolean value */
 
-    jlif_result (*parse_integer)(jlink *, long num);
+    jlif_result (*parse_integer)(jlink *, long long num);
         /* Optional, parser saw an integer value */
 
     jlif_result (*parse_double)(jlink *, double num);
diff --git a/src/ioc/db/test/jlinkz.c b/src/ioc/db/test/jlinkz.c
index 7bb8b831e..6683c6779 100644
--- a/src/ioc/db/test/jlinkz.c
+++ b/src/ioc/db/test/jlinkz.c
@@ -187,7 +187,7 @@ void z_free(jlink *pj)
 }
 
 static
-jlif_result z_int(jlink *pj, long num)
+jlif_result z_int(jlink *pj, long long num)
 {
     zpriv *priv = CONTAINER(pj, zpriv, base);
 
diff --git a/src/std/link/lnkCalc.c b/src/std/link/lnkCalc.c
index 05acf3350..286b61702 100644
--- a/src/std/link/lnkCalc.c
+++ b/src/std/link/lnkCalc.c
@@ -109,12 +109,12 @@ static void lnkCalc_free(jlink *pjlink)
     free(clink);
 }
 
-static jlif_result lnkCalc_integer(jlink *pjlink, long num)
+static jlif_result lnkCalc_integer(jlink *pjlink, long long num)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
     IFDEBUG(10)
-        printf("lnkCalc_integer(calc@%p, %ld)\n", clink, num);
+        printf("lnkCalc_integer(calc@%p, %lld)\n", clink, num);
 
     if (clink->pstate == ps_prec) {
         clink->prec = num;
@@ -123,7 +123,7 @@ static jlif_result lnkCalc_integer(jlink *pjlink, long num)
 
     if (clink->pstate != ps_args) {
         return jlif_stop;
-        errlogPrintf("lnkCalc: Unexpected integer %ld\n", num);
+        errlogPrintf("lnkCalc: Unexpected integer %lld\n", num);
     }
 
     if (clink->nArgs == CALCPERFORM_NARGS) {
diff --git a/src/std/link/lnkConst.c b/src/std/link/lnkConst.c
index a647e6a60..db824abbc 100644
--- a/src/std/link/lnkConst.c
+++ b/src/std/link/lnkConst.c
@@ -90,13 +90,13 @@ static void lnkConst_free(jlink *pjlink)
     free(clink);
 }
 
-static jlif_result lnkConst_integer(jlink *pjlink, long num)
+static jlif_result lnkConst_integer(jlink *pjlink, long long num)
 {
     const_link *clink = CONTAINER(pjlink, const_link, jlink);
     int newElems = clink->nElems + 1;
 
     IFDEBUG(10)
-        printf("lnkConst_integer(const@%p, %ld)\n", pjlink, num);
+        printf("lnkConst_integer(const@%p, %lld)\n", pjlink, num);
 
     switch (clink->type) {
         void *buf;