Mercurial > mplayer.hg

changeset 36808:1b5b0b63de4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vcd_read_os2.h: replace calloc() with _calloc() only in vcd_read_os2.h
author komh
date Sun, 23 Feb 2014 14:35:30 +0000
parents 072f64f1eec3
children 3f213bf6a8a2
files stream/vcd_read_os2.h
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 <emx/umalloc.h>
 #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 */