mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fenceposting the bug fixes with __arm__ ifdefs.

Browse Source
This commit is contained in:
Ward Fisher 2015-12-24 09:35:32 -07:00
parent 925da14d2a
commit d71e9ed5f6
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/ncx.h
View File

@ -995,8 +995,10 @@ ncx_putn_ulonglong_ulonglong(void **xpp, size_t nelems, const ulonglong *ip);
*/ */
/* read ASCII characters */ /* read ASCII characters */
#ifdef __arm__
extern int 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 extern int
ncx_pad_getn_text(const void **xpp, size_t nchars, signed char *cp); 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 extern int
ncx_pad_putn_text(void **xpp, size_t nchars, const signed char *cp); 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 */ /* for symmetry */
#define ncx_getn_char_char(xpp, nelems, fillp) ncx_getn_text(xpp, nelems, fillp) #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) #define ncx_putn_char_char(xpp, nelems, fillp) ncx_putn_text(xpp, nelems, fillp)

9
libsrc/ncx.m4
View File

@ -3330,14 +3330,23 @@ ncx_getn_text(const void **xpp, size_t nelems, char *tp)
NCX_GETN_Byte_Body NCX_GETN_Byte_Body
} }
#ifdef __arm__
int
ncx_pad_getn_text(const void **xpp, size_t nelems, signed char *tp)
#else
int int
ncx_pad_getn_text(const void **xpp, size_t nelems, char *tp) ncx_pad_getn_text(const void **xpp, size_t nelems, char *tp)
#endif
{ {
NCX_PAD_GETN_Byte_Body NCX_PAD_GETN_Byte_Body
} }
#ifdef __arm__
int ncx_putn_text(void **xp, size_t nelems, const signed char *tp)
#else
int int
ncx_putn_text(void **xpp, size_t nelems, const char *tp) ncx_putn_text(void **xpp, size_t nelems, const char *tp)
#endif
{ {
NCX_PUTN_Byte_Body NCX_PUTN_Byte_Body
} }