4 files changed, 7 insertions, 65 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 96f827d5b9..cdad2b82b3 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -98,7 +98,6 @@
 #undef OSF1
 #undef NEXT2
 #undef RELIANTUNIX
-#undef HAVE_SHARED_MMAP
 #undef HAVE_MMAP
 #undef HAVE_FCNTL_LOCK
 #undef HAVE_FTRUNCATE_EXTEND
@@ -538,9 +537,6 @@
 /* Define if you have the mktime function.  */
 #undef HAVE_MKTIME
 
-/* Define if you have the mmap64 function.  */
-#undef HAVE_MMAP64
-
 /* Define if you have the open64 function.  */
 #undef HAVE_OPEN64
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5bc4797cb4..e19295834a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -60,20 +60,6 @@
 #endif
 #endif /* RELIANTUNIX */
 
-#ifdef HAVE_SYSV_IPC
-#define USE_SYSV_IPC
-#endif
-
-#ifdef HAVE_SHARED_MMAP
-#define USE_SHARED_MMAP
-#endif
-
-
-/* if we have both SYSV IPC and shared mmap then we need to choose */
-#if (defined(USE_SYSV_IPC) && defined(USE_SHARED_MMAP))
-#  undef USE_SHARED_MMAP
-#endif
-
 #include <sys/types.h>
 
 #ifdef TIME_WITH_SYS_TIME
@@ -264,29 +250,6 @@
 #include <sys/mman.h>
 #endif
 
-#ifdef HAVE_SYSV_IPC
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/sem.h>
-
-/*
- * The following is needed if compiling
- * with gcc on SGI IRIX 6.5.x systems as
- * the structure packing for system calls is
- * different between IRIX cc and gcc.
- */
-
-#ifdef NEED_SGI_SEMUN_HACK
-union semun_hack {
-        int val;
-        struct semid_ds *buf;
-        unsigned short *array;
-       char __dummy[5];
-};
-#define semun semun_hack
-#endif /* NEED_SGI_SEMUN_HACK */
-#endif /* HAVE_SYSV_IPC */
-
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
@@ -748,24 +711,10 @@ typedef struct smb_wpasswd {
 #define SIGCLD SIGCHLD
 #endif
 
-#if (defined(HAVE_SYSV_IPC) || defined(HAVE_SHARED_MMAP))
-#define FAST_SHARE_MODES 1
-#endif
-
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 
-#ifdef HAVE_SYSV_IPC
-#ifndef HAVE_UNION_SEMUN
-union semun {
-	int val;
-	struct semid_ds *buf;
-	unsigned short *array;
-};
-#endif
-#endif
-
 #if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP))
 #define USE_SMBPASS_DB 1
 #endif
diff --git a/source3/include/local.h b/source3/include/local.h
index bd75d4e385..81212f9988 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -118,11 +118,6 @@
 /* the size of the uid cache used to reduce valid user checks */
 #define UID_CACHE_SIZE 4
 
-/* if mmap is enabled, then this is the maximum size of file to use
-   the mmap code on. We don't want to mmap huge files as virtual
-   address spaces are limited */
-#define MAX_MMAP_SIZE (100*0x100000)
-
 /* the following control timings of various actions. Don't change 
    them unless you know what you are doing. These are all in seconds */
 #define DEFAULT_SMBD_TIMEOUT (60*60*24*7)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 27711f2ed4..9d1c158cef 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -195,6 +195,13 @@ int smbrun(char *cmd,char *outfile,BOOL shared);
 /*The following definitions come from  lib/snprintf.c  */
 
 
+/*The following definitions come from  lib/substitute.c  */
+
+void standard_sub_basic(char *str);
+void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str);
+void standard_sub(connection_struct *conn, char *str);
+void standard_sub_snum(int snum, char *str);
+
 /*The following definitions come from  lib/system.c  */
 
 int sys_select(int maxfd, fd_set *fds,struct timeval *tval);
@@ -210,7 +217,6 @@ SMB_OFF_T sys_ftell(FILE *fp);
 int sys_creat(const char *path, mode_t mode);
 int sys_open(const char *path, int oflag, mode_t mode);
 FILE *sys_fopen(const char *path, const char *type);
-void *sys_mmap(void *addr, size_t len, int prot, int flags, int fd, SMB_OFF_T offset);
 SMB_STRUCT_DIRENT *sys_readdir(DIR *dirp);
 int sys_waitpid(pid_t pid,int *status,int options);
 char *sys_getwd(char *s);
@@ -313,10 +319,6 @@ BOOL is_ipaddress(const char *str);
 uint32 interpret_addr(char *str);
 struct in_addr *interpret_addr2(char *str);
 BOOL zero_ip(struct in_addr ip);
-void standard_sub_basic(char *str);
-void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str);
-void standard_sub(connection_struct *conn, char *str);
-void standard_sub_snum(int snum, char *str);
 BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask);
 struct hostent *Get_Hostbyname(const char *name);
 BOOL process_exists(pid_t pid);