reorder headers so that largefile support is defined before the first copy of stdio

git-svn-id: svn://svn.videolan.org/x264/trunk@672 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/common.h b/common/common.h
index 7e147ef5ecc4203534b453aa4111c2153e5b33ae..f4aaa219aab8c3b95ea57b2036676cb9d342ae20 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -62,11 +62,11 @@
 /****************************************************************************
  * Includes
  ****************************************************************************/
+#include "osdep.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "osdep.h"
 #include "x264.h"
 #include "bs.h"
 #include "set.h"

diff --git a/common/osdep.h b/common/osdep.h
index 74a570c3db224819cee3eb1ba7aaf378a9bccca8..09c5451102b741fe254fb2b9f0e5171a8c814e3a 100644 (file)
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -21,16 +21,16 @@
 #ifndef _OSDEP_H
 #define _OSDEP_H
 
+#define _LARGEFILE_SOURCE 1
+#define _FILE_OFFSET_BITS 64
+#include <stdio.h>
+
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #else
 #include <inttypes.h>
 #endif
 
-#define _LARGEFILE_SOURCE 1
-#define _FILE_OFFSET_BITS 64
-#include <stdio.h>
-
 #ifdef _MSC_VER
 #include <io.h>    // _setmode()
 #include <fcntl.h> // _O_BINARY

diff --git a/muxers.c b/muxers.c
index 46315367a2c757ee6b3d65368bb66b1f1e25f186..12254be819972c9b5076acceb1ebd298a872a45d 100644 (file)
--- a/muxers.c
+++ b/muxers.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <sys/types.h>
-
 #include "common/common.h"
 #include "x264.h"
 #include "matroska.h"
@@ -29,6 +27,8 @@
 #include "config.h"
 #endif
 
+#include <sys/types.h>
+
 #ifdef AVIS_INPUT
 #include <windows.h>
 #include <vfw.h>