6b96683e92c8dc9e0bc5c01a20f52454ba90476c hiram Tue Nov 12 15:10:15 2013 -0800 new 5.0 gcc compiler on mac OSX will not accept bare inline functions must be static inline instead refs #12106 diff --git src/lib/twoBit.c src/lib/twoBit.c index 05d0986..36caeb1 100644 --- src/lib/twoBit.c +++ src/lib/twoBit.c @@ -27,67 +27,67 @@ static void udcSeekWrap(void *file, bits64 offset) { udcSeek((struct udcFile *)file, offset); } static void udcMustReadWrap(void *file, void *buf, size_t size) { udcMustRead((struct udcFile *)file, buf, size); } static inline void udcFileCloseWrap(void *pFile) { udcFileClose((struct udcFile **)pFile); } -inline bits32 udcReadBits32Wrap(void *f, boolean isSwapped) +static inline bits32 udcReadBits32Wrap(void *f, boolean isSwapped) { return udcReadBits32((struct udcFile *)f, isSwapped); } -inline boolean udcFastReadStringWrap(void *f, char buf[256]) +static inline boolean udcFastReadStringWrap(void *f, char buf[256]) { return udcFastReadString((struct udcFile *)f, buf); } /* now the stdio wrappers */ static void seekCurWrap(void *file, bits64 offset) { fseek((FILE *)file, offset, SEEK_CUR); } static void seekWrap(void *file, bits64 offset) { fseek((FILE *)file, offset, SEEK_SET); } static void mustReadWrap(void *file, void *buf, size_t size) { mustRead((FILE *)file, buf, size); } -inline void fileCloseWrap(void *pFile) +static inline void fileCloseWrap(void *pFile) { carefulClose((FILE **)pFile); } -inline bits32 readBits32Wrap(void *f, boolean isSwapped) +static inline bits32 readBits32Wrap(void *f, boolean isSwapped) { return readBits32((FILE *)f, isSwapped); } -inline boolean fastReadStringWrap(void *f, char buf[256]) +static inline boolean fastReadStringWrap(void *f, char buf[256]) { return fastReadString((FILE *)f, buf); } static void setFileFuncs( struct twoBitFile *tbf, boolean useUdc) /* choose the proper function pointers depending on whether * this open twoBit is using stdio or UDC */ { if (useUdc) { tbf->ourSeekCur = udcSeekCurWrap; tbf->ourSeek = udcSeekWrap; tbf->ourReadBits32 = udcReadBits32Wrap; tbf->ourFastReadString = udcFastReadStringWrap;