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.

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)

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])
 

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
+#   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) )
 

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
 
 
 /*****************************************************************************

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
+

include/interface.h

@@ -24,7 +24,6 @@
 
 /*****************************************************************************
  * Required headers:
- *  <sys/uio.h>
  *  <X11/Xlib.h>
  *  <X11/extensions/XShm.h>
  *  "config.h"

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>

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>

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_* */

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"

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"

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>

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>

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"

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>

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() */

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() */
 

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() */
  

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"

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"

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"

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>
 

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"

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() */

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() */

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() */
 

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

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"

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: Gal 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"

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"

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"

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"

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>
  *          Gal 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"

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"

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>
 

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"

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>
  *          Stphane 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"