=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ox.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- OpenXM_contrib2/asir2018/include/ox.h 2019/12/13 14:40:50 1.2 +++ OpenXM_contrib2/asir2018/include/ox.h 2020/03/29 17:01:55 1.3 @@ -45,9 +45,12 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2018/include/ox.h,v 1.1 2018/09/19 06:00:58 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2018/include/ox.h,v 1.2 2019/12/13 14:40:50 fujimoto Exp $ */ #include "com.h" +#defined(linux) +#include +#endif /* version */ @@ -160,7 +163,8 @@ typedef FILE *ox_stream; #if defined(ANDROID) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_r) #elif defined(linux) -#define FP_DATA_IS_AVAILABLE(fp) ((fp)->_IO_read_ptr < (fp)->_IO_read_end) +//#define FP_DATA_IS_AVAILABLE(fp) ((fp)->_IO_read_ptr < (fp)->_IO_read_end) +#define FP_DATA_IS_AVAILABLE(fp) (__freadable(fp)) #elif defined(__FreeBSD__) || defined(__DARWIN__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__INTERIX) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_r) #elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(_IBMR2)