[MPlayer-cvslog] r36904 - trunk/stream/vcd_read_os2.h

[komh]

Author: komh
Date: Sun Feb 23 15:35:30 2014
New Revision: 36904

Log:
vcd_read_os2.h: replace calloc() with _calloc() only in vcd_read_os2.h

Modified:
   trunk/stream/vcd_read_os2.h

Modified: trunk/stream/vcd_read_os2.h
==============================================================================
--- trunk/stream/vcd_read_os2.h	Sun Feb 23 14:06:57 2014	(r36903)
+++ trunk/stream/vcd_read_os2.h	Sun Feb 23 15:35:30 2014	(r36904)
@@ -23,13 +23,13 @@
 #ifndef MPLAYER_VCD_READ_OS2_H
 #define MPLAYER_VCD_READ_OS2_H
 
+#include "mp_msg.h"
+
 #ifdef __KLIBC__
 #include <emx/umalloc.h>
 #define calloc _lcalloc
 #endif
 
-#include "mp_msg.h"
-
 struct __attribute__((packed)) msf {
     BYTE bFrame;
     BYTE bSecond;
@@ -244,5 +244,9 @@ static int vcd_read(mp_vcd_priv_t *vcd, 
     return VCD_SECTOR_DATA;
 }
 
+#ifdef __KLIBC__
+#undef calloc
+#endif
+
 #endif /* MPLAYER_VCD_READ_OS2_H */