From: JP Dinger <jpd@videolan.org>
Date: Fri, 22 May 2009 00:25:27 +0000 (+0200)
Subject: Moving system includes to happen before vlc includes should obviate
X-Git-Tag: 1.1.0-ff~5820
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7eb67a0de8cc9bc34efea7d65b512470ae58afcc;p=vlc

Moving system includes to happen before vlc includes should obviate
the need for compilation fixes with standard headers.
---

diff --git a/src/config/file.c b/src/config/file.c
index 9d12a97254..9b779ab1b4 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -16,20 +16,15 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include "../libvlc.h"
-#include "vlc_charset.h"
-#include "vlc_keys.h"
-
 #include <errno.h>                                                  /* errno */
 #include <assert.h>
 #include <limits.h>
@@ -41,6 +36,11 @@
 #include <locale.h>
 #endif
 
+#include <vlc_common.h>
+#include "../libvlc.h"
+#include "vlc_charset.h"
+#include "vlc_keys.h"
+
 #include "configuration.h"
 #include "modules/modules.h"
 
diff --git a/src/test/keys.c b/src/test/keys.c
index ab569c0bd8..807366e2f0 100644
--- a/src/test/keys.c
+++ b/src/test/keys.c
@@ -13,22 +13,22 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_keys.h>
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 
+#include <vlc_common.h>
+#include <vlc_keys.h>
+
 int main (void)
 {
     bool ok = true;