From d71e9ed5f609d18a0b7ae09ec3329aa6c453fdb1 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 24 Dec 2015 09:35:32 -0700
Subject: [PATCH] Fenceposting the bug fixes with __arm__ ifdefs.

---
 libsrc/ncx.h  | 19 ++++++++++++++++++-
 libsrc/ncx.m4 |  9 +++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/libsrc/ncx.h b/libsrc/ncx.h
index 9a87fa437..47cf4f8c7 100644
--- a/libsrc/ncx.h
+++ b/libsrc/ncx.h
@@ -995,8 +995,10 @@ ncx_putn_ulonglong_ulonglong(void **xpp, size_t nelems, const ulonglong *ip);
  */
 
 /* read ASCII characters */
+#ifdef __arm__
+
 extern int
-ncx_getn_text(const void **xpp, size_t nchars, char *cp);
+ncx_getn_text(const void **xpp, size_t nchars, signed char *cp);
 extern int
 ncx_pad_getn_text(const void **xpp, size_t nchars, signed char *cp);
 
@@ -1006,6 +1008,21 @@ ncx_putn_text(void **xpp, size_t nchars, const signed char *cp);
 extern int
 ncx_pad_putn_text(void **xpp, size_t nchars, const signed char *cp);
 
+#else // ifdef __arm__
+
+extern int
+ncx_getn_text(const void **xpp, size_t nchars, char *cp);
+extern int
+ncx_pad_getn_text(const void **xpp, size_t nchars, char *cp);
+
+/* write ASCII characters */
+extern int
+ncx_putn_text(void **xpp, size_t nchars, const char *cp);
+extern int
+ncx_pad_putn_text(void **xpp, size_t nchars, const char *cp);
+
+#endif //ifdef __arm__
+
 /* for symmetry */
 #define ncx_getn_char_char(xpp, nelems, fillp) ncx_getn_text(xpp, nelems, fillp)
 #define ncx_putn_char_char(xpp, nelems, fillp) ncx_putn_text(xpp, nelems, fillp)
diff --git a/libsrc/ncx.m4 b/libsrc/ncx.m4
index ebabe5981..be363dd84 100644
--- a/libsrc/ncx.m4
+++ b/libsrc/ncx.m4
@@ -3330,14 +3330,23 @@ ncx_getn_text(const void **xpp, size_t nelems, char *tp)
 NCX_GETN_Byte_Body
 }
 
+#ifdef __arm__
+int
+ncx_pad_getn_text(const void **xpp, size_t nelems, signed char *tp)
+#else
 int
 ncx_pad_getn_text(const void **xpp, size_t nelems, char *tp)
+#endif
 {
 NCX_PAD_GETN_Byte_Body
 }
 
+#ifdef __arm__
+int ncx_putn_text(void **xp, size_t nelems, const signed char *tp)
+#else
 int
 ncx_putn_text(void **xpp, size_t nelems, const char *tp)
+#endif
 {
 NCX_PUTN_Byte_Body
 }