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 9d12a97254d7c37f5be83a325de320e477436cb3..9b779ab1b420ed9372435da63dcd57bac6d75d10 100644 (file)
--- 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 ab569c0bd8e6ecf326699b9b1a2339a520bab011..807366e2f05d8928ea386cef1bb1782ddd7fabc4 100644 (file)
--- 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;