diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
| commit | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (patch) | |
| tree | cc52764dfa4fab2cfc74c6aee5d71b27edbf014b /vidix | |
| parent | 3ba97da297e1e1a5ca9dabdda60cc6a62f77affc (diff) | |
| parent | 39cb032fd184a62416f1e62d26e05576cfd8dbe4 (diff) | |
| download | mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.bz2 mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.xz | |
Merge svn changes up to r28341
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/dha.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vidix/dha.c b/vidix/dha.c index 638be29328..8a2d8fd1cd 100644 --- a/vidix/dha.c +++ b/vidix/dha.c @@ -43,7 +43,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -#ifdef ARCH_ALPHA +#if ARCH_ALPHA #include <sys/io.h> #endif #include <unistd.h> @@ -91,7 +91,7 @@ static int mem_fd = -1; void *map_phys_mem(unsigned long base, unsigned long size) { -#ifdef ARCH_ALPHA +#if ARCH_ALPHA /* TODO: move it into sysdep */ base += bus_base(); #endif |