From 9eb826478c0fea0137eacad09c662682b80ad216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 5 Nov 2002 00:56:08 +0000
Subject: [PATCH] =?UTF-8?q?MIN/MAX=20sys/param.h=20patch=20by=20(Fran?=
 =?UTF-8?q?=C3=A7ois=20Revol=20<revol=20at=20free=20dot=20fr>)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally committed as revision 1164 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffserver.c       | 8 ++++++--
 libav/http.c     | 2 +-
 libav/rtp.c      | 2 +-
 libav/rtpproto.c | 2 +-
 libav/rtsp.c     | 2 +-
 libav/tcp.c      | 2 +-
 libav/udp.c      | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index aa8e72c8964..33508ec5eb9 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -17,10 +17,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #define HAVE_AV_CONFIG_H
+#include <netinet/in.h>
 #include "avformat.h"
 
 #include <stdarg.h>
-#include <netinet/in.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -31,7 +31,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <arpa/inet.h>
+#ifndef __BEOS__
+# include <arpa/inet.h>
+#else
+# include "libav/barpainet.h"
+#endif
 #include <netdb.h>
 #include <ctype.h>
 #include <signal.h>
diff --git a/libav/http.c b/libav/http.c
index 7271a6da818..64025f2258e 100644
--- a/libav/http.c
+++ b/libav/http.c
@@ -16,11 +16,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/rtp.c b/libav/rtp.c
index 714787c88b1..b42065fbea6 100644
--- a/libav/rtp.c
+++ b/libav/rtp.c
@@ -16,11 +16,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/rtpproto.c b/libav/rtpproto.c
index 41823fc8293..25b10b8bf28 100644
--- a/libav/rtpproto.c
+++ b/libav/rtpproto.c
@@ -16,12 +16,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 
 #include <unistd.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/rtsp.c b/libav/rtsp.c
index 81b59f89161..667a3c095a1 100644
--- a/libav/rtsp.c
+++ b/libav/rtsp.c
@@ -16,10 +16,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <netinet/in.h>
 #include "avformat.h"
 
 #include <sys/time.h>
-#include <netinet/in.h>
 #include <sys/socket.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/tcp.c b/libav/tcp.c
index 61d8665525d..6f4c037dcb9 100644
--- a/libav/tcp.c
+++ b/libav/tcp.c
@@ -16,11 +16,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
diff --git a/libav/udp.c b/libav/udp.c
index 8df93a8a8a9..6e91a22350a 100644
--- a/libav/udp.c
+++ b/libav/udp.c
@@ -16,10 +16,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <sys/socket.h>
 #include "avformat.h"
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #ifndef __BEOS__
 # include <arpa/inet.h>
-- 
GitLab