diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /vidix/dha.h | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
| download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'vidix/dha.h')
| -rw-r--r-- | vidix/dha.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vidix/dha.h b/vidix/dha.h index c19ed0fc07..eb2a269c46 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -36,8 +36,8 @@ #ifndef MPLAYER_DHA_H #define MPLAYER_DHA_H -#ifdef __cplusplus -extern "C" { +#ifndef DEV_SVGA +#define DEV_SVGA "/dev/svga" #endif #define MAX_DEV_PER_VENDOR_CFG1 64 @@ -88,8 +88,4 @@ extern void unmap_phys_mem(void *ptr, unsigned long size); #define MTRR_TYPE_WRBACK 6 extern int mtrr_set_type(unsigned base,unsigned size,int type); -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_DHA_H */ |