diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-03-14 09:38:03 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-03-14 09:38:03 +0000 |
| commit | 513b66997b1a0c4e804c13b6840ccd7a7de41ad9 (patch) | |
| tree | 6e17ae5e4d93c4e229885cfd0173d99ff96956c6 /src/xine-engine/osd.h | |
| parent | 3153a3a8519aacb14bc8af15c63176f10b54a4ec (diff) | |
| download | xine-lib-513b66997b1a0c4e804c13b6840ccd7a7de41ad9.tar.gz xine-lib-513b66997b1a0c4e804c13b6840ccd7a7de41ad9.tar.bz2 | |
Update WIN32 port:
- add stdint.h with INT16_MIN/MAX
- apply forgotten change _MSC_VER -> HAVE_ICONV
- get rid of some _MSC_VER - changed to WIN32 since it'll be used by MINGW too
CVS patchset: 6249
CVS date: 2004/03/14 09:38:03
Diffstat (limited to 'src/xine-engine/osd.h')
| -rw-r--r-- | src/xine-engine/osd.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index fc1a31bca..b50b1f1f4 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -18,15 +18,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * * OSD stuff (text and graphic primitives) - * $Id: osd.h,v 1.24 2004/02/12 18:19:12 mroi Exp $ + * $Id: osd.h,v 1.25 2004/03/14 09:38:03 valtri Exp $ */ #ifndef HAVE_OSD_H #define HAVE_OSD_H -#ifndef _MSC_VER +#ifdef HAVE_ICONV # include <iconv.h> -#endif /* _MSC_VER */ +#endif #ifdef XINE_COMPILE # include "video_overlay.h" @@ -59,7 +59,7 @@ struct osd_object_s { int32_t handle; -#ifndef _MSC_VER +#ifdef HAVE_ICONV iconv_t cd; /* iconv handle of encoding */ char *encoding; /* name of encoding */ #endif |