# HG changeset patch # User komh # Date 1393166130 0 # Node ID 1b5b0b63de4bf1af9fc19d34bbeb544dcbbf271d # Parent 072f64f1eec381c8d961600e1435e30b062b1955 vcd_read_os2.h: replace calloc() with _calloc() only in vcd_read_os2.h diff -r 072f64f1eec3 -r 1b5b0b63de4b stream/vcd_read_os2.h --- a/stream/vcd_read_os2.h Sun Feb 23 13:06:57 2014 +0000 +++ b/stream/vcd_read_os2.h Sun Feb 23 14:35:30 2014 +0000 @@ -23,13 +23,13 @@ #ifndef MPLAYER_VCD_READ_OS2_H #define MPLAYER_VCD_READ_OS2_H +#include "mp_msg.h" + #ifdef __KLIBC__ #include #define calloc _lcalloc #endif -#include "mp_msg.h" - struct __attribute__((packed)) msf { BYTE bFrame; BYTE bSecond; @@ -244,5 +244,9 @@ return VCD_SECTOR_DATA; } +#ifdef __KLIBC__ +#undef calloc +#endif + #endif /* MPLAYER_VCD_READ_OS2_H */