From 2e9b4c23ded14fc69ed5eaf428464d822ae069f5 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Fri, 14 Sep 2012 07:38:03 -0500
Subject: [PATCH] FS-4618 --resolve

---
 libs/esl/src/esl_json.c | 4 ++--
 src/switch_json.c       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/esl/src/esl_json.c b/libs/esl/src/esl_json.c
index 3de776b3a8..767c29da02 100644
--- a/libs/esl/src/esl_json.c
+++ b/libs/esl/src/esl_json.c
@@ -275,8 +275,8 @@ ESL_DECLARE(cJSON *)cJSON_Parse(const char *value)
 }
 
 /* Render a cJSON item/entity/structure to text. */
-char *cJSON_Print(cJSON *item)				{return print_value(item,0,1);}
-char *cJSON_PrintUnformatted(cJSON *item)	{return print_value(item,0,0);}
+ESL_DECLARE(char *) cJSON_Print(cJSON *item)				{return print_value(item,0,1);}
+ESL_DECLARE(char *) cJSON_PrintUnformatted(cJSON *item)	{return print_value(item,0,0);}
 
 /* Parser core - when encountering text, process appropriately. */
 static const char *parse_value(cJSON *item,const char *value)
diff --git a/src/switch_json.c b/src/switch_json.c
index 005b32fd34..c68e678ebf 100644
--- a/src/switch_json.c
+++ b/src/switch_json.c
@@ -27,11 +27,11 @@
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
-#include <float.h>
 #include <limits.h>
 #include <ctype.h>
-#include "switch_json.h"
 #include "switch.h"
+#include "switch_json.h"
+#include <float.h>
 
 static const char *ep;
 
@@ -275,8 +275,8 @@ SWITCH_DECLARE(cJSON *)cJSON_Parse(const char *value)
 }
 
 /* Render a cJSON item/entity/structure to text. */
-char *cJSON_Print(cJSON *item)				{return print_value(item,0,1);}
-char *cJSON_PrintUnformatted(cJSON *item)	{return print_value(item,0,0);}
+SWITCH_DECLARE(char *)cJSON_Print(cJSON *item)				{return print_value(item,0,1);}
+SWITCH_DECLARE(char *)cJSON_PrintUnformatted(cJSON *item)	{return print_value(item,0,0);}
 
 /* Parser core - when encountering text, process appropriately. */
 static const char *parse_value(cJSON *item,const char *value)