Re-arrange include ordering. Fixes build on SunOS.

This commit is contained in:
jperkin 2013-02-22 21:38:06 +00:00
parent 6f13a889c6
commit a843f113c2
2 changed files with 30 additions and 1 deletions

View file

@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.12 2012/01/08 03:39:25 sbd Exp $
$NetBSD: distinfo,v 1.13 2013/02/22 21:38:06 jperkin Exp $
SHA1 (rox/rox-filer-2.10.tar.bz2) = 691297d18be69a883db0a38130f5df99f9e1bc29
RMD160 (rox/rox-filer-2.10.tar.bz2) = 48b64ccaceb96b59fbd2467aa65d8e128ebd960d
Size (rox/rox-filer-2.10.tar.bz2) = 1903129 bytes
SHA1 (patch-ROX-Filer_src_mount.c) = 19d820cf74d57dbfeb255b21522639ac2fc41574
SHA1 (patch-aa) = 20cf42090c9cd3149af6e7be59f826624062d759
SHA1 (patch-ab) = bec4e64a5f54109fab55f89b8da9a55d0465d0ab
SHA1 (patch-ac) = fc78b2208cb052bedaab4ae3c1e59677bc299f6e

View file

@ -0,0 +1,28 @@
$NetBSD: patch-ROX-Filer_src_mount.c,v 1.1 2013/02/22 21:38:06 jperkin Exp $
Re-order includes so the correct ones are used on SunOS.
--- ROX-Filer/src/mount.c.orig 2009-07-18 14:23:18.000000000 +0000
+++ ROX-Filer/src/mount.c
@@ -29,6 +29,10 @@
#ifdef HAVE_MNTENT_H
/* Linux, etc */
# include <mntent.h>
+#elif HAVE_SYS_MNTENT_H
+ /* SunOS */
+# include <sys/mntent.h>
+# include <sys/mnttab.h>
#elif HAVE_SYS_UCRED_H
/* NetBSD, OSF1, etc */
# include <fstab.h>
@@ -37,10 +41,6 @@
# include <sys/ucred.h>
# include <sys/mount.h>
# include <stdlib.h>
-#elif HAVE_SYS_MNTENT_H
- /* SunOS */
-# include <sys/mntent.h>
-# include <sys/mnttab.h>
#endif
#include <sys/time.h>
#ifdef HAVE_SYS_VFS_H