From 1c6aed0974b504500d8d1720591bfdd8c40472b7 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 24 Mar 2009 12:41:37 +0000
Subject: [PATCH] DEVEL15-fd-t-definition-fun-20090323

LICENSE IPL10

make FD_t be defined everywhere we need it


(cherry picked from commit 63b0d495cfc6362bced7b2492310cf1a0bf684b0)
---
 src/libadmin/vos/afs_vosAdmin.c | 16 ++++++++--------
 src/vol/devname.c               |  1 +
 src/vol/fs_conv_411.c           |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

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 f9fce94d7..c49e35e10 100644
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -86,6 +86,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.
diff --git a/src/vol/fs_conv_411.c b/src/vol/fs_conv_411.c
index 056203844..65ef89995 100644
--- a/src/vol/fs_conv_411.c
+++ b/src/vol/fs_conv_411.c
@@ -77,6 +77,7 @@ RCSID
 #include <errno.h>
 
 #include <nfs.h>
+#include <ihandle.h>
 #include <partition.h>
 #include <afs/cmd.h>
 #include <stdlib.h>
-- 
2.39.5