From: Rob Browning <rlb@defaultvalue.org>
Date: Fri, 20 Sep 2013 18:33:02 +0000 (-0500)
Subject: Move non-system includes after system includes in _helpers.c.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=08521dbf5bbaa2d8c8acd18a89cb9616bb25eaf7;p=packages%2Fb%2Fbup.git

Move non-system includes after system includes in _helpers.c.

Having Python.h before assert.h was apparently causing trouble on
OpenBSD:

  _helpers.c: In function 'bup_xutime_ns':
  _helpers.c:842: warning: implicit declaration of function 'utimensat'
  _helpers.c:842: error: 'AT_FDCWD' undeclared (first use in this function)
  _helpers.c:842: error: (Each undeclared identifier is reported only once
  _helpers.c:842: error: for each function it appears in.)
  _helpers.c:843: error: 'AT_SYMLINK_NOFOLLOW' undeclared (first use in this function)
  error: command 'cc' failed with exit status 1

...and moving the non-sytem includes lower is reasonable anyway.

Thanks to Ryan Hinton <iobass@email.com> for the report.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/lib/bup/_helpers.c b/lib/bup/_helpers.c
index fcd4b8c..fe48511 100644
--- a/lib/bup/_helpers.c
+++ b/lib/bup/_helpers.c
@@ -2,8 +2,6 @@
 #define PY_SSIZE_T_CLEAN 1
 #undef NDEBUG
 #include "../../config/config.h"
-#include "bupsplit.h"
-#include <Python.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -30,6 +28,9 @@
 #include <sys/ioctl.h>
 #endif
 
+#include "bupsplit.h"
+#include <Python.h>
+
 #if defined(FS_IOC_GETFLAGS) && defined(FS_IOC_SETFLAGS)
 #define BUP_HAVE_FILE_ATTRS 1
 #endif