diff options
| author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-11-14 08:44:32 +0200 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-11-14 08:44:32 +0200 |
| commit | b724ff4045994fff721db4ab67f8aa418cc4f707 (patch) | |
| tree | d31ee198383667daf37d094b95a98f7c59ad0190 | |
| parent | 587d4e40e58e70649968261f73b7fb2078349f4f (diff) | |
Revert "Only enable z4l.c on Linux" until we have a consensus.
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/geode_msr.c | 5 |
3 files changed, 0 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 3c85469..483caff 100644 --- a/configure.ac +++ b/configure.ac @@ -114,17 +114,6 @@ AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) AC_SUBST([AMD_CFLAGS]) -case $host_os in - *linux*) - BUILD_Z4L=yes - ;; - *) - BUILD_Z4l=no - ;; -esac - -AM_CONDITIONAL(BUILD_Z4L, [test "x$BUILD_Z4L" = xyes]) - is386=false case $host_cpu in diff --git a/src/Makefile.am b/src/Makefile.am index 61e17f3..6817ea4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -145,12 +145,10 @@ EXTRA_DIST = \ gx_vga.c \ lx_vga.c -#if BUILD_Z4L ztv_drv_la_LTLIBRARIES = ztv_drv.la ztv_drv_la_LDFLAGS = -module -avoid-version ztv_drv_ladir = @moduledir@/drivers ztv_drv_la_SOURCES = \ z4l.c -#endif diff --git a/src/geode_msr.c b/src/geode_msr.c index 19dbe67..6de693f 100644 --- a/src/geode_msr.c +++ b/src/geode_msr.c @@ -3,11 +3,6 @@ #include <unistd.h> #include <fcntl.h> #include <sys/types.h> -/* Complement BSD variants not found via types.h */ -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -#define lseek64 lseek -#define off64_t off_t -#endif #include <errno.h> #include "os.h" #include "geode.h" |