From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 24 Mar 2009 04:31:13 +0000 (+0000)
Subject: fd-t-definition-fun-20090323
X-Git-Tag: openafs-devel-1_5_61~399
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=63b0d495cfc6362bced7b2492310cf1a0bf684b0;p=packages%2Fo%2Fopenafs.git

fd-t-definition-fun-20090323

LICENSE IPL10

make FD_t be defined everywhere we need it
---

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 05505901a..5468bfae9 100644
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -33,14 +33,6 @@ RCSID
 #include <afs/vlserver.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
-#include <afs/ihandle.h>
-#include <afs/partition.h>
-#include <rx/rx.h>
-#include <rx/rxstat.h>
-#include <afs/afs_utilAdmin.h>
-#include "vosutils.h"
-#include "vsprocs.h"
-#include "lockprocs.h"
 
 /* File descriptors are HANDLE's on NT. The following typedef helps catch
  * type errors. Duplicated from vol/ihandle.h
@@ -52,6 +44,14 @@ typedef int FD_t;
 #endif
 #define INVALID_FD ((FD_t)-1)
 
+#include <afs/partition.h>
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+#include <afs/afs_utilAdmin.h>
+#include "vosutils.h"
+#include "vsprocs.h"
+#include "lockprocs.h"
+
 typedef struct file_server {
     int begin_magic;
     int is_valid;
diff --git a/src/vol/devname.c b/src/vol/devname.c
index 4ef3de4b8..02aaead97 100644
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -82,6 +82,7 @@ RCSID
 #ifndef ITIMER_REAL
 #include <sys/time.h>
 #endif /* ITIMER_REAL */
+#include "ihandle.h"
 #include "partition.h"
 
 /* ensure that we don't have a "/" instead of a "/dev/rxd0a" type of device.