3 files changed, 7 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 03c2d461e6..15a5e74e46 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -541,7 +541,9 @@ char *mktemp(char *); /* No standard include */
 #define NEED_AUTH_PARAMETERS
 #endif
 #define SIGNAL_CAST (void (*)(__harg))
+#ifndef HPUX10 /* This is only needed for HPUX 9.x */
 #define SELECT_CAST (int *)
+#endif /* HPUX10 */
 #define SYSV
 #define USE_WAITPID
 #define WAIT3_CAST2 (int *)
@@ -550,7 +552,7 @@ char *mktemp(char *); /* No standard include */
 #define USE_SETRES
 #define DEFAULT_PRINTING PRINT_HPUX
 #define SIGCLD_IGNORE
-#endif
+#endif /* HPUX */
 
 
 #ifdef SEQUENT
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0fa4251b82..56bdbfe865 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -703,8 +703,8 @@ void close_file(int fnum);
 BOOL check_file_sharing(int cnum,char *fname);
 void open_file_shared(int fnum,int cnum,char *fname,int share_mode,int ofun,
 		      int mode,int *Access,int *action);
-int seek_file(int fnum,int pos);
-int read_file(int fnum,char *data,int pos,int n);
+int seek_file(int fnum,uint32 pos);
+int read_file(int fnum,char *data,uint32 pos,int n);
 int write_file(int fnum,char *data,int n);
 BOOL become_service(int cnum,BOOL do_chdir);
 int find_service(char *service);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2b6888b8a7..0f2dc01865 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -314,11 +314,11 @@ typedef struct
   int cnum;
   file_fd_struct *fd_ptr;
   int pos;
-  int size;
+  uint32 size;
   int mode;
   int uid;
   char *mmap_ptr;
-  int mmap_size;
+  uint32 mmap_size;
   write_bmpx_struct *wbmpx_ptr;
   struct timeval open_time;
   BOOL open;