BSD port, including :

* --enable-sdl and some others are now --with-sdl[=name] to supply an
optional library name ;
* deleted all unnecessary #include <sys/uio.h> ;
* /usr/include is now searched when looking for libraries and headers.

It seems to compile and run on BSD. Under Linux Sam's latest commit makes
vlc crash on startup, so I can't really tell, but hey it compiles.

diff --git a/Makefile.in b/Makefile.in
index 9fe198a76343e9dfe6495e83ff51f22940a19d35..cdd81337a8ac45f1e542af43ae243ae7e8208d46 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,9 @@ prefix=@prefix@
 CC=@CC@
 SHELL=@SHELL@
 
+LIB_SDL=@LIB_SDL@
+LIB_GLIDE=@LIB_GLIDE@
+LIB_GGI=@LIB_GGI@
 
 #----------------- do not change anything below this line ----------------------
 
@@ -50,7 +53,7 @@ PROGRAM_BUILD = `date` $(USER)
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.
-DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z A-Z)
+DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr a-z. A-Z_)
 
 ################################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -495,49 +498,49 @@ lib/beos.so: $(PLUGIN_BEOS)
 
 lib/esd.so: $(PLUGIN_ESD)
 ifneq (,$(findstring bsd,$(SYS)))
-       $(CC) -shared -lesd -o $@ $^
+       $(CC) $(LCFLAGS) -shared -lesd -o $@ $^
 else
-       $(CC) -shared -laudiofile -lesd -o $@ $^
+       $(CC) $(LCFLAGS) -shared -laudiofile -lesd -o $@ $^
 endif
 
 lib/dsp.so: $(PLUGIN_DSP)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/alsa.so: $(PLUGIN_ALSA)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/null.so: $(PLUGIN_NULL)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/dummy.so: $(PLUGIN_DUMMY)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/fb.so: $(PLUGIN_FB)
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 
 lib/x11.so: $(PLUGIN_X11)
-       $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+       $(CC) $(LCFLAGS) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
 
 lib/mga.so: $(PLUGIN_MGA)
-       $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+       $(CC) $(LCFLAGS) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
 
 lib/gnome.so: $(PLUGIN_GNOME)
-       $(CC) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
+       $(CC) $(LCFLAGS) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
 
 lib/glide.so: $(PLUGIN_GLIDE)
-       $(CC) -shared -lglide2x -o $@ $^
+       $(CC) $(LCFLAGS) -shared $(LIB_GLIDE) -o $@ $^
 
 lib/ggi.so: $(PLUGIN_GGI)
-       $(CC) -shared -lggi -o $@ $^
+       $(CC) $(LCFLAGS) -shared $(LIB_GGI) -o $@ $^
 
 lib/sdl.so: $(PLUGIN_SDL)
-       $(CC) -shared -lSDL -o $@ $^
+       $(CC) $(LCFLAGS) -shared $(LIB_SDL) -o $@ $^
 
 lib/yuv.so: $(PLUGIN_YUV)
 ifeq ($(SYS),beos)
        $(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 else
-       $(CC) -shared -o $@ $^
+       $(CC) $(LCFLAGS) -shared -o $@ $^
 endif
 
 lib/yuvmmx.so: $(PLUGIN_YUVMMX)

diff --git a/configure b/configure
index 2ca2e32cb12d72d89ade9912660451ef8bb9326a..50fa9337652fbdad2dff516cfd67b406f2b859a9 100755 (executable)
--- a/configure
+++ b/configure
@@ -30,11 +30,11 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-fb             Linux framebuffer support (default disabled)"
 ac_help="$ac_help
-  --enable-ggi            GGI support (default disabled)"
+  --with-ggi[=name]       GGI support (default disabled)"
 ac_help="$ac_help
-  --enable-sdl            SDL support (default disabled)"
+  --with-sdl[=name]       SDL support (default disabled)"
 ac_help="$ac_help
-  --enable-glide          Glide (3dfx) support (default disabled)"
+  --with-glide[=name]     Glide (3dfx) support (default disabled)"
 ac_help="$ac_help
   --enable-null           Null plugin (default disabled)"
 ac_help="$ac_help
@@ -2607,21 +2607,62 @@ fi
 
 
 
+CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+for ac_hdr in stddef.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2616: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2621 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
 for ac_hdr in getopt.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2615: checking for $ac_hdr" >&5
+echo "configure:2656: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2620 "configure"
+#line 2661 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2651,17 +2692,17 @@ for ac_hdr in sys/sockio.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2655: checking for $ac_hdr" >&5
+echo "configure:2696: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2660 "configure"
+#line 2701 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2691,17 +2732,17 @@ for ac_hdr in fcntl.h sys/ioctl.h sys/time.h unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2695: checking for $ac_hdr" >&5
+echo "configure:2736: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2700 "configure"
+#line 2741 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2731,17 +2772,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_hdr" >&5
+echo "configure:2776: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2740 "configure"
+#line 2781 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2771,17 +2812,17 @@ for ac_hdr in dlfcn.h image.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2775: checking for $ac_hdr" >&5
+echo "configure:2816: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2780 "configure"
+#line 2821 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2811,17 +2852,57 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2815: checking for $ac_hdr" >&5
+echo "configure:2856: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2820 "configure"
+#line 2861 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in machine/param.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2896: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2901 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2852,17 +2933,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2856: checking for $ac_hdr" >&5
+echo "configure:2937: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2861 "configure"
+#line 2942 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2889,13 +2970,42 @@ fi
 done
 
 
+save_CFLAGS=$CFLAGS
+CFLAGS="${CFLAGS} -Wall -Werror"
+echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6
+echo "configure:2977: checking for ntohl in sys/param.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2979 "configure"
+#include "confdefs.h"
+#include <sys/param.h>
+void foo() { int meuh; ntohl(meuh); }
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define NTOHL_IN_SYS_PARAM_H 1
+EOF
+
+ echo "$ac_t""yes" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+CFLAGS=$save_CFLAGS
+
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2894: checking for working const" >&5
+echo "configure:3004: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2899 "configure"
+#line 3009 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2944,7 +3054,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2965,12 +3075,12 @@ EOF
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2969: checking for ANSI C header files" >&5
+echo "configure:3079: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2974 "configure"
+#line 3084 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2978,7 +3088,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2995,7 +3105,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2999 "configure"
+#line 3109 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3013,7 +3123,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3017 "configure"
+#line 3127 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3034,7 +3144,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3038 "configure"
+#line 3148 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3045,7 +3155,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3069,12 +3179,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3073: checking for size_t" >&5
+echo "configure:3183: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3078 "configure"
+#line 3188 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3102,12 +3212,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3106: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3216: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3111 "configure"
+#line 3221 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3116,7 +3226,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3151,10 +3261,11 @@ fi
 # Check whether --enable-mmx or --disable-mmx was given.
 if test "${enable_mmx+set}" = set; then
   enableval="$enable_mmx"
-  :
+   if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi 
+else
+   if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi 
 fi
 
-if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then if test x$enableval != xno; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ; fi
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -3210,22 +3321,40 @@ if test "${enable_fb+set}" = set; then
   if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; ALIASES=${ALIASES}"fbvlc "; fi
 fi
 
-# Check whether --enable-ggi or --disable-ggi was given.
-if test "${enable_ggi+set}" = set; then
-  enableval="$enable_ggi"
-  if test x$enable_ggi = xyes; then PLUGINS=${PLUGINS}"ggi "; fi
+# Check whether --with-ggi or --without-ggi was given.
+if test "${with_ggi+set}" = set; then
+  withval="$with_ggi"
+   PLUGINS=${PLUGINS}"ggi ";
+    if test "x$withval" != "xyes";
+    then
+      LIB_GGI="-l"$withval
+    else
+      LIB_GGI="-lggi"
+    fi 
 fi
 
-# Check whether --enable-sdl or --disable-sdl was given.
-if test "${enable_sdl+set}" = set; then
-  enableval="$enable_sdl"
-  if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; fi
+# Check whether --with-sdl or --without-sdl was given.
+if test "${with_sdl+set}" = set; then
+  withval="$with_sdl"
+   PLUGINS=${PLUGINS}"sdl ";
+    if test "x$withval" != "xyes";
+    then
+      LIB_SDL="-l"$withval
+    else
+      LIB_SDL="-lSDL"
+    fi 
 fi
 
-# Check whether --enable-glide or --disable-glide was given.
-if test "${enable_glide+set}" = set; then
-  enableval="$enable_glide"
-  if test x$enable_glide = xyes; then PLUGINS=${PLUGINS}"glide "; fi
+# Check whether --with-glide or --without-glide was given.
+if test "${with_glide+set}" = set; then
+  withval="$with_glide"
+   PLUGINS=${PLUGINS}"glide ";
+    if test "x$withval" != "xyes";
+    then
+      LIB_GLIDE="-l"$withval
+    else
+      LIB_GLIDE="-lglide2x"
+    fi 
 fi
 
 # Check whether --enable-null or --disable-null was given.
@@ -3252,17 +3381,17 @@ if test "${enable_alsa+set}" = set; then
   enableval="$enable_alsa"
   if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-echo "configure:3256: checking for sys/asoundlib.h" >&5
+echo "configure:3385: checking for sys/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3261 "configure"
+#line 3390 "configure"
 #include "confdefs.h"
 #include <sys/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3279,7 +3408,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:3283: checking for main in -lasound" >&5
+echo "configure:3412: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3287,14 +3416,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3291 "configure"
+#line 3420 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3333,6 +3462,9 @@ fi
 
 
 
+
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -3487,6 +3619,9 @@ s%@ALIASES@%$ALIASES%g
 s%@DEBUG@%$DEBUG%g
 s%@STATS@%$STATS%g
 s%@OPTIMS@%$OPTIMS%g
+s%@LIB_SDL@%$LIB_SDL%g
+s%@LIB_GLIDE@%$LIB_GLIDE%g
+s%@LIB_GGI@%$LIB_GGI%g
 
 CEOF
 EOF

diff --git a/configure.in b/configure.in
index 6c333d23f18594dab033e53cc7e4bfd9882497f0..b9a86c0ca5cadcd4038cb30c696f3ff57088cf8c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,16 +49,29 @@ dnl check for getopt_long, substitute the distributed versions if not
 AC_CHECK_FUNC(getopt_long,,[LIBOBJS="$LIBOBJS getopt.o getopt1.o"])
 AC_SUBST(LIBOBJS)
 
+CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+AC_CHECK_HEADERS(stddef.h)
 AC_CHECK_HEADERS(getopt.h)
 AC_CHECK_HEADERS(sys/sockio.h)
 AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h)
 AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
+AC_CHECK_HEADERS(machine/param.h)
 
 dnl Check for threads library
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
 
+dnl Check for ntohl, etc.
+save_CFLAGS=$CFLAGS
+CFLAGS="${CFLAGS} -Wall -Werror"
+AC_MSG_CHECKING([for ntohl in sys/param.h])
+AC_TRY_COMPILE([#include <sys/param.h>
+void foo() { int meuh; ntohl(meuh); }],,
+ AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Gabuzomeu)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+CFLAGS=$save_CFLAGS
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
@@ -73,8 +86,9 @@ AC_ARG_ENABLE(ppro,
 [ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ],
 [ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ])
 AC_ARG_ENABLE(mmx,
-[  --disable-mmx           Disable MMX optimizations (default enabled for x86)])
-if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then if test x$enableval != xno; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ; fi
+[  --disable-mmx           Disable MMX optimizations (default enabled for x86)],
+[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ],
+[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}"yuvmmx "; fi ])
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debug mode (default disabled)],
 [ if test x$enableval = xyes; then DEBUG=1; fi ])
@@ -107,15 +121,33 @@ AC_ARG_ENABLE(esd,
 AC_ARG_ENABLE(fb,
   [  --enable-fb             Linux framebuffer support (default disabled)],
   [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; ALIASES=${ALIASES}"fbvlc "; fi])
-AC_ARG_ENABLE(ggi,
-  [  --enable-ggi            GGI support (default disabled)],
-  [if test x$enable_ggi = xyes; then PLUGINS=${PLUGINS}"ggi "; fi])
-AC_ARG_ENABLE(sdl,
-  [  --enable-sdl            SDL support (default disabled)],
-  [if test x$enable_sdl = xyes; then PLUGINS=${PLUGINS}"sdl "; fi])
-AC_ARG_ENABLE(glide,
-  [  --enable-glide          Glide (3dfx) support (default disabled)],
-  [if test x$enable_glide = xyes; then PLUGINS=${PLUGINS}"glide "; fi])
+AC_ARG_WITH(ggi,
+  [  --with-ggi[=name]       GGI support (default disabled)],
+  [ PLUGINS=${PLUGINS}"ggi ";
+    if test "x$withval" != "xyes";
+    then
+      LIB_GGI="-l"$withval
+    else
+      LIB_GGI="-lggi"
+    fi ])
+AC_ARG_WITH(sdl,
+  [  --with-sdl[=name]       SDL support (default disabled)],
+  [ PLUGINS=${PLUGINS}"sdl ";
+    if test "x$withval" != "xyes";
+    then
+      LIB_SDL="-l"$withval
+    else
+      LIB_SDL="-lSDL"
+    fi ])
+AC_ARG_WITH(glide,
+  [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
+  [ PLUGINS=${PLUGINS}"glide ";
+    if test "x$withval" != "xyes";
+    then
+      LIB_GLIDE="-l"$withval
+    else
+      LIB_GLIDE="-lglide2x"
+    fi ])
 AC_ARG_ENABLE(null,
   [  --enable-null           Null plugin (default disabled)],
   [if test x$enable_null = xyes; then PLUGINS=${PLUGINS}"null "; fi])
@@ -138,6 +170,9 @@ AC_SUBST(ALIASES)
 AC_SUBST(DEBUG)
 AC_SUBST(STATS)
 AC_SUBST(OPTIMS)
+AC_SUBST(LIB_SDL)
+AC_SUBST(LIB_GLIDE)
+AC_SUBST(LIB_GGI)
 
 AC_OUTPUT([Makefile include/config.h])
 

diff --git a/include/common.h b/include/common.h
index 4d64e1a759c287b34652c4faf41d3610e5085d91..bebf59a0cc6f7bc5394f4fd29ebb8f7419e38bfc 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.19 2000/12/26 19:14:46 massiot Exp $
+ * $Id: common.h,v 1.20 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -47,16 +47,15 @@ typedef int                 boolean_t;
 #endif
 
 /* ptrdiff_t definition */
-#ifdef _HAVE_STDDEF_H
+#ifdef HAVE_STDDEF_H
 #   include <stddef.h>
 #else
 #   include <malloc.h>
-#endif
-
-#ifndef _PTRDIFF_T
-#   define _PTRDIFF_T
+#   ifndef _PTRDIFF_T
+#       define _PTRDIFF_T
 /* Not portable in a 64-bit environment. */
 typedef int                 ptrdiff_t;
+#   endif
 #endif
 
 /* Counter for statistics and profiling */
@@ -126,6 +125,12 @@ typedef struct video_parser_s *         p_video_parser_t;
  * Macros and inline functions
  *****************************************************************************/
 
+#ifdef NTOHL_IN_SYS_PARAM_H
+#   include <sys/param.h>
+#else
+#   include <netinet/in.h>
+#endif
+
 /* CEIL: division with round to nearest greater integer */
 #define CEIL(n, d)  ( ((n) / (d)) + ( ((n) % (d)) ? 1 : 0) )
 

diff --git a/include/debug.h b/include/debug.h
index 6f14f93738f5be6c21e05e22165f89d0dc17ad84..0a240ac2dfa2a02b47e999fb3e8efd7696aaeb97 100644 (file)
--- a/include/debug.h
+++ b/include/debug.h
@@ -71,6 +71,8 @@ bzero(&(r_Var), sizeof((r_Var)));
  * This macro is used to initiase the memory pointed out by a pointer to 0.
  * It has the same purpose than RZERO, but for pointers.
  *****************************************************************************/
+/* It is already defined on BSD */
+#ifndef PZERO
 #ifdef DEBUG
 #define PZERO(p_Mem)                                                          \
 bzero((p_Mem), sizeof(*(p_Mem)));
@@ -79,6 +81,7 @@ bzero((p_Mem), sizeof(*(p_Mem)));
 #define PZERO(p_Mem)
 
 #endif
+#endif
 
 
 /*****************************************************************************

diff --git a/include/defs.h.in b/include/defs.h.in
index c856e6651a614e5302ddb0542005540fe41bd296..4cba38dc782771367048cc8565a72e2e5c8cc1f6 100644 (file)
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -79,6 +79,9 @@
 /* Define if you have the <kernel/scheduler.h> header file.  */
 #undef HAVE_KERNEL_SCHEDULER_H
 
+/* Define if you have the <machine/param.h> header file.  */
+#undef HAVE_MACHINE_PARAM_H
+
 /* Define if you have the <machine/soundcard.h> header file.  */
 #undef HAVE_MACHINE_SOUNDCARD_H
 
@@ -91,6 +94,9 @@
 /* Define if you have the <pthread.h> header file.  */
 #undef HAVE_PTHREAD_H
 
+/* Define if you have the <stddef.h> header file.  */
+#undef HAVE_STDDEF_H
+
 /* Define if you have the <sys/ioctl.h> header file.  */
 #undef HAVE_SYS_IOCTL_H
 
@@ -144,3 +150,7 @@
 
 /* Define if you have the threads library (-lthreads).  */
 #undef HAVE_LIBTHREADS
+
+/* Gabuzomeu */
+#undef NTOHL_IN_SYS_PARAM_H
+

diff --git a/include/interface.h b/include/interface.h
index 62d7d046b57ec11dbfb8078c3e71a018095e29ec..2354e6db127fb8e2033f5297e6a0926d52407dd8 100644 (file)
--- a/include/interface.h
+++ b/include/interface.h
@@ -24,7 +24,6 @@
 
 /*****************************************************************************
  * Required headers:
- *  <sys/uio.h>
  *  <X11/Xlib.h>
  *  <X11/extensions/XShm.h>
  *  "config.h"

diff --git a/plugins/beos/aout_beos.cpp b/plugins/beos/aout_beos.cpp
index 161ef43c477fa1a0744636cda30918698b65f3c3..347350f0b936489010f7a16026405662f3667cc3 100644 (file)
--- a/plugins/beos/aout_beos.cpp
+++ b/plugins/beos/aout_beos.cpp
@@ -2,6 +2,7 @@
  * aout_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: aout_beos.cpp,v 1.7 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  * Samuel Hocevar <sam@via.ecp.fr>
@@ -28,8 +29,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
 #include <kernel/OS.h>
 #include <View.h>
 #include <Application.h>

diff --git a/plugins/beos/intf_beos.cpp b/plugins/beos/intf_beos.cpp
index 4578b6f0292f4b8c3bb26505e66c9b86357ab7f6..53c0a4fe1978c95958f5a8b1c9d468be8d7f9524 100644 (file)
--- a/plugins/beos/intf_beos.cpp
+++ b/plugins/beos/intf_beos.cpp
@@ -2,6 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_beos.cpp,v 1.6 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  * Jean-Marc Dressler
@@ -28,8 +29,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
 #include <kernel/OS.h>
 #include <View.h>
 #include <Application.h>

diff --git a/plugins/fb/intf_fb.c b/plugins/fb/intf_fb.c
index 750e63edc716d199fe2cb442529d504948440797..5348da5be667e1bcbdf2e921b17df6aed31e2c5e 100644 (file)
--- a/plugins/fb/intf_fb.c
+++ b/plugins/fb/intf_fb.c
@@ -2,6 +2,7 @@
  * intf_fb.c: Linux framebuffer interface plugin
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
+ * $Id: intf_fb.c,v 1.7 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  *
@@ -31,8 +32,6 @@
 #include <string.h>                                            /* strerror() */
 #include <unistd.h>                                                /* read() */
 #include <sys/ioctl.h>                                            /* ioctl() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 
 #include <termios.h>                                       /* struct termios */
 #include <linux/vt.h>                                                /* VT_* */

diff --git a/plugins/ggi/intf_ggi.c b/plugins/ggi/intf_ggi.c
index 7bcbe16ea72edf5480c2af12407b07ee3530c7a2..8d336bfbafa7670e7cbb184586667f141a28f8af 100644 (file)
--- a/plugins/ggi/intf_ggi.c
+++ b/plugins/ggi/intf_ggi.c
@@ -6,6 +6,7 @@
  * driver.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_ggi.c,v 1.7 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  *
@@ -33,8 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ggi/ggi.h>
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 
 #include "config.h"
 #include "common.h"

diff --git a/plugins/glide/intf_glide.c b/plugins/glide/intf_glide.c
index cab98dfaf3dfae72aaf9590ff08d35c7c1a7ba7d..93e6911de4bf56fd06017e251d6aa1eb802d866a 100644 (file)
--- a/plugins/glide/intf_glide.c
+++ b/plugins/glide/intf_glide.c
@@ -2,6 +2,7 @@
  * intf_glide.c: 3dfx interface plugin
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
+ * $Id: intf_glide.c,v 1.6 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  *
@@ -26,8 +27,6 @@
 #include "defs.h"
 
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 #include <linutil.h>                            /* Glide kbhit() and getch() */
 
 #include "config.h"

diff --git a/plugins/gnome/intf_gnome.c b/plugins/gnome/intf_gnome.c
index 13badbd102b6f732e472041d3aa1c0e543488cfa..d43371eb0e4286ee808f199dce46bdcbdaf0f795 100644 (file)
--- a/plugins/gnome/intf_gnome.c
+++ b/plugins/gnome/intf_gnome.c
@@ -2,6 +2,7 @@
  * intf_gnome.c: Gnome interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_gnome.c,v 1.6 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  *
@@ -28,8 +29,6 @@
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/plugins/mga/intf_mga.c b/plugins/mga/intf_mga.c
index cc389763c2489a735807dade49a5a4d8c67550f9..1ebc7696e67a0369e33d6f3547869f281d6fd05c 100644 (file)
--- a/plugins/mga/intf_mga.c
+++ b/plugins/mga/intf_mga.c
@@ -2,6 +2,7 @@
  * intf_mga.c: MGA interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_mga.c,v 1.6 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  *
@@ -28,8 +29,6 @@
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/plugins/sdl/intf_sdl.c b/plugins/sdl/intf_sdl.c
index a40cb18d2fc462796e3416865ca077dd1a4dc329..5dfc1c6971cdcde1f780bca608a632f51cb22b00 100644 (file)
--- a/plugins/sdl/intf_sdl.c
+++ b/plugins/sdl/intf_sdl.c
@@ -2,6 +2,7 @@
  * intf_sdl.c: SDL interface plugin
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_sdl.c,v 1.19 2001/01/05 18:46:43 massiot Exp $
  *
  * Authors:
  *
@@ -29,8 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <SDL/SDL.h>                                /* for all the SDL stuff */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 
 #include "config.h"
 #include "common.h"

diff --git a/plugins/x11/intf_x11.c b/plugins/x11/intf_x11.c
index 18eb3a8303f6b3ac7532c995d562b37d7573a805..6fda1ce042bc549fb31b2cc6b6b8417592b28cb6 100644 (file)
--- a/plugins/x11/intf_x11.c
+++ b/plugins/x11/intf_x11.c
@@ -2,6 +2,7 @@
  * intf_x11.c: X11 interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_x11.c,v 1.6 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors:
  *
@@ -28,8 +29,6 @@
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/plugins/x11/vout_x11.c b/plugins/x11/vout_x11.c
index c82c7f36dabf6565fe2cf5dd8f109700b2566423..2a217147de4a771ad7853419078f1b9f22cafb03 100644 (file)
--- a/plugins/x11/vout_x11.c
+++ b/plugins/x11/vout_x11.c
@@ -2,6 +2,7 @@
  * vout_x11.c: X11 video output display method
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: vout_x11.c,v 1.7 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors:
  *
@@ -29,8 +30,11 @@
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 
-#ifdef SYS_BSD
+#ifdef HAVE_MACHINE_PARAM_H
+/* BSD */
+#include <machine/param.h>
 #include <sys/types.h>                                     /* typedef ushort */
+#include <sys/ipc.h>
 #endif
 
 #include <sys/shm.h>                                   /* shmget(), shmctl() */

diff --git a/src/ac3_decoder/ac3_decoder_thread.c b/src/ac3_decoder/ac3_decoder_thread.c
index 73f7d6629d501d416fddd73acad72f4f1aeddf1d..69b4e95f0a9b60db46f8a7311f03d70364292cae 100644 (file)
--- a/src/ac3_decoder/ac3_decoder_thread.c
+++ b/src/ac3_decoder/ac3_decoder_thread.c
@@ -2,7 +2,7 @@
  * ac3_decoder_thread.c: ac3 decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_decoder_thread.c,v 1.22 2000/12/27 18:35:45 massiot Exp $
+ * $Id: ac3_decoder_thread.c,v 1.23 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors:
  *
@@ -39,15 +39,12 @@
 
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
 
 #include "config.h"
 #include "common.h"
 #include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
-#include "debug.h"                                      /* "input_netlist.h" */
 
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 

diff --git a/src/audio_decoder/audio_decoder.c b/src/audio_decoder/audio_decoder.c
index a1752c5b761d1e5a20afdc296201d9bd0319a43b..4a8bfec7026f50dd0387afbdb2c0102117c1e8f0 100644 (file)
--- a/src/audio_decoder/audio_decoder.c
+++ b/src/audio_decoder/audio_decoder.c
@@ -2,7 +2,7 @@
  * audio_decoder.c: MPEG audio decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: audio_decoder.c,v 1.44 2001/01/04 18:47:18 massiot Exp $
+ * $Id: audio_decoder.c,v 1.45 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -40,16 +40,12 @@
 
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
-#include <netinet/in.h>                                             /* ntohl */
 
 #include "config.h"
 #include "common.h"
 #include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
-#include "debug.h"                                      /* "input_netlist.h" */
 
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
  

diff --git a/src/generic_decoder/generic_decoder.c b/src/generic_decoder/generic_decoder.c
index 58af24143cfcd6522411ae5c01881b1a64bfe4df..6571a6446d459e2b23a8df18afec16ea07590a8e 100644 (file)
--- a/src/generic_decoder/generic_decoder.c
+++ b/src/generic_decoder/generic_decoder.c
@@ -39,9 +39,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>
 
 #include "config.h"
 #include "common.h"

diff --git a/src/input/input_netlist.c b/src/input/input_netlist.c
index b1a1c7cf2ee4392bc88acaf0a817994977c8726e..439549890c17faf4d74878625ffea6addf962cb1 100644 (file)
--- a/src/input/input_netlist.c
+++ b/src/input/input_netlist.c
@@ -2,7 +2,7 @@
  * input_netlist.c: netlist management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_netlist.c,v 1.24 2000/12/30 00:38:19 massiot Exp $
+ * $Id: input_netlist.c,v 1.25 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *
@@ -27,7 +27,9 @@
 #include "defs.h"
 
 #include <stdlib.h>
+#include <sys/types.h>
 #include <sys/uio.h>                                         /* struct iovec */
+#include <unistd.h>
 
 #include "config.h"
 #include "common.h"

diff --git a/src/input/input_ps.c b/src/input/input_ps.c
index 83b6c844849ac07e67a39aa9a876bae69bd52092..83d5c7b126205df59abc5127cbe26d9ef9c44555 100644 (file)
--- a/src/input/input_ps.c
+++ b/src/input/input_ps.c
@@ -2,7 +2,7 @@
  * input_ps.c: PS demux and packet management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.17 2000/12/29 14:04:59 sam Exp $
+ * $Id: input_ps.c,v 1.18 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: 
  *
@@ -27,10 +27,8 @@
 #include "defs.h"
 
 #include <stdlib.h>
-#include <netinet/in.h>
 #include <string.h>
 #include <errno.h>
-#include <malloc.h>
 
 #include "config.h"
 #include "common.h"

diff --git a/src/input/input_ts.c b/src/input/input_ts.c
index 8046acdc73d3cbdeff192723cbd072ba42652823..c32dd953f4bb74a942d75d51a74dc5333781e45d 100644 (file)
--- a/src/input/input_ts.c
+++ b/src/input/input_ts.c
@@ -2,7 +2,7 @@
  * input_ts.c: TS demux and netlist management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ts.c,v 1.2 2000/12/21 15:01:08 massiot Exp $
+ * $Id: input_ts.c,v 1.3 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: 
  *
@@ -27,7 +27,6 @@
 #include "defs.h"
 
 #include <stdlib.h>
-#include <netinet/in.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/src/input/mpeg_system.c b/src/input/mpeg_system.c
index 0d3c81976b9638adc6c073eb192a3912a049a503..99906b00b269c49a3274e5606517cc7850959309 100644 (file)
--- a/src/input/mpeg_system.c
+++ b/src/input/mpeg_system.c
@@ -2,7 +2,7 @@
  * mpeg_system.c: TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: mpeg_system.c,v 1.23 2000/12/29 14:04:59 sam Exp $
+ * $Id: mpeg_system.c,v 1.24 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: 
  *
@@ -27,7 +27,6 @@
 #include "defs.h"
 
 #include <stdlib.h>
-#include <netinet/in.h>
 
 #include "config.h"
 #include "common.h"

diff --git a/src/interface/intf_ctrl.c b/src/interface/intf_ctrl.c
index a87c9e78b0368fe3accdd2fa81e09bf386a11e9e..723f88664b8a66b73239122ea14cf223a3925fcd 100644 (file)
--- a/src/interface/intf_ctrl.c
+++ b/src/interface/intf_ctrl.c
@@ -42,9 +42,7 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/stat.h>                        /* on BSD, fstat() needs stat.h */
-#include <sys/uio.h>                                            /* "input.h" */
 #include <stdio.h>                                              /* fprintf() */
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <unistd.h>                                       /* close(), read() */

diff --git a/src/interface/main.c b/src/interface/main.c
index a067959a67d8c7a5339935cf8d632e83da9baa09..bbf7f382b2089746097f1681ce2b135bc9a03fcb 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -39,8 +39,8 @@
 #include <string.h>                                            /* strerror() */
 
 #include "config.h"
-#include "debug.h"
 #include "common.h"
+#include "debug.h"
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"                                              /* TestMMX() */

diff --git a/src/lpcm_decoder/lpcm_decoder_thread.c b/src/lpcm_decoder/lpcm_decoder_thread.c
index f231c0a7f49e2ea620a25805ba5e3210921e223e..8104b50a844303180ea8bd005d59dee502bc6951 100644 (file)
--- a/src/lpcm_decoder/lpcm_decoder_thread.c
+++ b/src/lpcm_decoder/lpcm_decoder_thread.c
@@ -2,7 +2,7 @@
  * lpcm_decoder_thread.c: lpcm decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: lpcm_decoder_thread.c,v 1.8 2001/01/05 14:46:37 sam Exp $
+ * $Id: lpcm_decoder_thread.c,v 1.9 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors:
  *
@@ -30,15 +30,12 @@
 
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
 
 #include "config.h"
 #include "common.h"
 #include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
-#include "debug.h"                                      /* "input_netlist.h" */
 
 #include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
 

diff --git a/src/misc/netutils.c b/src/misc/netutils.c
index 43b91f50c8a68e6cc0388ddb2fd1deded47ef51f..36d9969c6fb0967b25444879e962aa26f9840617 100644 (file)
--- a/src/misc/netutils.c
+++ b/src/misc/netutils.c
@@ -42,7 +42,7 @@
 #endif
 
 #include <unistd.h>                           /* needed for ioctl on Solaris */
-#include <stropts.h>
+//#include <stropts.h>
 
 #if defined (HAVE_NET_IF_H)
 #include <net/if.h>                            /* interface (arch-dependent) */
@@ -137,6 +137,9 @@ int ServerPort( char *psz_addr )
  *****************************************************************************
  * i_sockfd must reference a socket open as follow: AF_INET, DOCK_DGRAM, 0
  *****************************************************************************/
+#if 0
+/* pbm :  SIOCGIFHWADDR, doesn't exist on BSD -> find a portable way to
+   do this --Meuuh */
 int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
 {
     int i_rc = 0;
@@ -231,7 +234,6 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
 }
 
 
-
 /*****************************************************************************
  * ReadNetConf: Retrieve the network configuration of the host
  *****************************************************************************
@@ -330,3 +332,4 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
 }
 
 
+#endif

diff --git a/src/spu_decoder/spu_decoder.c b/src/spu_decoder/spu_decoder.c
index 687e34eb244cf0fc36d641458bb7fc1f213c66ce..46e61b0d1591ddc0680335cf2df5ecd3703cf3b2 100644 (file)
--- a/src/spu_decoder/spu_decoder.c
+++ b/src/spu_decoder/spu_decoder.c
@@ -26,8 +26,6 @@
 #include "defs.h"
 
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 #include <unistd.h>                                              /* getpid() */
 
 #include "config.h"

diff --git a/src/video_decoder/vdec_idct.c b/src/video_decoder/vdec_idct.c
index c4bc02697fd1e18f51ff483e3a4b2fec5d12b8a5..f0627d15642e203fe09cb558995766cb47cd776a 100644 (file)
--- a/src/video_decoder/vdec_idct.c
+++ b/src/video_decoder/vdec_idct.c
@@ -2,7 +2,7 @@
  * vdec_idct.c : IDCT functions
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_idct.c,v 1.22 2000/12/21 17:19:52 massiot Exp $
+ * $Id: vdec_idct.c,v 1.23 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
  *
@@ -26,9 +26,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
-
 #include "config.h"
 #include "common.h"
 #include "threads.h"

diff --git a/src/video_decoder/vdec_motion.c b/src/video_decoder/vdec_motion.c
index 2ac53840b7301ef643bb573253801200e9d4c929..686381d2a5414f6fd83101000d1c1231245f8937 100644 (file)
--- a/src/video_decoder/vdec_motion.c
+++ b/src/video_decoder/vdec_motion.c
@@ -2,7 +2,7 @@
  * vdec_motion.c : motion compensation routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_motion.c,v 1.34 2001/01/05 14:46:37 sam Exp $
+ * $Id: vdec_motion.c,v 1.35 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -28,9 +28,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
-
 #include "config.h"
 #include "common.h"
 #include "threads.h"

diff --git a/src/video_decoder/vdec_motion_inner.c b/src/video_decoder/vdec_motion_inner.c
index 69bc047afc408ed9cee55463275658a83bf66094..34105c7ce01e98681b4106d3872fc6c1360455ed 100644 (file)
--- a/src/video_decoder/vdec_motion_inner.c
+++ b/src/video_decoder/vdec_motion_inner.c
@@ -2,7 +2,7 @@
  * vdec_motion_inner.c : motion compensation inner routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_motion_inner.c,v 1.11 2001/01/05 14:46:37 sam Exp $
+ * $Id: vdec_motion_inner.c,v 1.12 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -28,9 +28,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
-
 #include "config.h"
 #include "common.h"
 #include "threads.h"

diff --git a/src/video_decoder/vdec_motion_inner_mmx.c b/src/video_decoder/vdec_motion_inner_mmx.c
index 4b3cde53ffd752ac33acc10fd4af3d44259a9a4b..4a2d8c4b0cac26e598b98058df91b61cfdea6970 100644 (file)
--- a/src/video_decoder/vdec_motion_inner_mmx.c
+++ b/src/video_decoder/vdec_motion_inner_mmx.c
@@ -3,7 +3,7 @@
  *                           MMX
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_motion_inner_mmx.c,v 1.6 2001/01/05 14:46:37 sam Exp $
+ * $Id: vdec_motion_inner_mmx.c,v 1.7 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>, largerly inspired by the
  *          work done by the livid project <http://www.linuxvideo.org/>
@@ -28,9 +28,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
-
 #include "config.h"
 #include "common.h"
 #include "threads.h"

diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c
index 6fe2ccdc20ec8f9100b055a0e5bdffff95c19e65..2813d2aaeb8689f61a81adde48bcb07dc1c83bb3 100644 (file)
--- a/src/video_decoder/video_decoder.c
+++ b/src/video_decoder/video_decoder.c
@@ -2,7 +2,7 @@
  * video_decoder.c : video decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_decoder.c,v 1.43 2000/12/23 03:10:59 sam Exp $
+ * $Id: video_decoder.c,v 1.44 2001/01/05 18:46:44 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gaël Hendryckx <jimmy@via.ecp.fr>
@@ -29,8 +29,6 @@
 
 #include <stdlib.h>                                                /* free() */
 #include <unistd.h>                                              /* getpid() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                          /* for input.h */
 #include <errno.h>                                                  /* errno */
 
 #include "config.h"

diff --git a/src/video_parser/video_fifo.c b/src/video_parser/video_fifo.c
index 575d142011beced5997a6667e1639b483e2f3eab..edf84d83bcbbf74ef05ca799b24b2ed11d0149e1 100644 (file)
--- a/src/video_parser/video_fifo.c
+++ b/src/video_parser/video_fifo.c
@@ -2,7 +2,7 @@
  * video_fifo.c : video FIFO management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_fifo.c,v 1.24 2000/12/21 17:19:54 massiot Exp $
+ * $Id: video_fifo.c,v 1.25 2001/01/05 18:46:45 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -26,9 +26,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                             /* "input.h */
-
 #include "config.h"
 #include "common.h"
 #include "threads.h"

diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c
index fbb2f0fe2974203e3e7940acaf7ac637f593e2f8..25f1f134f58d4361668be6e1031f79c11c59b621 100644 (file)
--- a/src/video_parser/video_parser.c
+++ b/src/video_parser/video_parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_parser.c,v 1.60 2001/01/02 14:03:30 massiot Exp $
+ * $Id: video_parser.c,v 1.61 2001/01/05 18:46:45 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -29,8 +29,6 @@
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <unistd.h>                                              /* getpid() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
 #include <errno.h>
 #include <string.h>
 

diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index 7bc35a934f3cd44ed5e2d88e9620745eac39a2fe..61d1f830275071a8d30b8413b7a7f895218b831b 100644 (file)
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -2,7 +2,7 @@
  * vpar_blocks.c : blocks parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_blocks.c,v 1.68 2000/12/22 13:04:45 sam Exp $
+ * $Id: vpar_blocks.c,v 1.69 2001/01/05 18:46:45 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -28,8 +28,6 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
 #include <string.h>                                                /* memset */
 
 #include "config.h"

diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c
index 98dd6f66b9374a7fb73f1558aed55140d5a63319..3555e4a8b1058199a0c729a193baf20f56bfb87a 100644 (file)
--- a/src/video_parser/vpar_headers.c
+++ b/src/video_parser/vpar_headers.c
@@ -2,7 +2,7 @@
  * vpar_headers.c : headers parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_headers.c,v 1.65 2000/12/29 12:49:30 massiot Exp $
+ * $Id: vpar_headers.c,v 1.66 2001/01/05 18:46:45 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -28,8 +28,6 @@
 #include "defs.h"
 
 #include <stdlib.h>                                                /* free() */
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
-#include <sys/uio.h>                                            /* "input.h" */
 
 #include "config.h"
 #include "common.h"