DEVEL15-fd-t-definition-fun-20090323

LICENSE IPL10

make FD_t be defined everywhere we need it

(cherry picked from commit 63b0d495cfc6362bced7b2492310cf1a0bf684b0)

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 05505901adeac1ffebd4a9d6bcc2f8dbb4a5c511..5468bfae977235c136ddd7706dd95e805d0a2676 100644 (file)
--- 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 f9fce94d7157e6db4c1c2d8c5e0eb00d68bc8af1..c49e35e10b482ae2b02fc85ac6e72e0d0dbaac09 100644 (file)
--- 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 056203844880270988aacb4676432ec95d24e36c..65ef899953b7e783f84970d6d7c66f3b82a0e32c 100644 (file)
--- 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>