3 files changed, 5 insertions, 32 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2408b3c194..dc1fe57e71 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -198,27 +198,6 @@
 #include <shadow.h>
 #endif
 
-/* this might be different on different systems */
-#ifdef QUOTAS 
-#ifdef LINUX
-#ifdef __KERNEL__
-#undef __KERNEL__
-#include <sys/quota.h>
-#define __KERNEL__
-#else
-#include <sys/quota.h>
-#endif
-#include <mntent.h>
-#else
-#include <sys/quota.h>
-#ifndef CRAY
-#include <devnm.h>
-#else
-#include <mntent.h>
-#endif
-#endif
-#endif
-
 #ifdef SYSLOG
 #include <syslog.h>
 #endif
@@ -499,6 +478,8 @@ char *mktemp(char *); /* No standard include */
 #define USE_WAITPID
 #define SIGNAL_CAST (void (*)())
 #define DEFAULT_PRINTING PRINT_AIX
+/* we undef this because sys/param.h is broken in aix. uggh. */
+#undef MAXHOSTNAMELEN
 #endif
 
 
diff --git a/source3/include/local.h b/source3/include/local.h
index fba7955902..9572243e73 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -83,12 +83,6 @@
    manager window? */
 #define FSTYPE_STRING "Samba"
 
-/* we have two time standards - local and GMT. This will try to sort them out.
- */
-
-#define LOCAL_TO_GMT 1
-#define GMT_TO_LOCAL (-1)
-
 /* do you want smbd to send a 1 byte packet to nmbd to trigger it to start 
    when smbd starts? */
 #ifndef PRIME_NMBD
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b7faffa9e9..4d99529ef6 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -624,7 +624,6 @@ int smb_numwords(char *buf);
 int get_share_mode(int cnum,struct stat *sbuf,int *pid);
 void del_share_mode(int fnum);
 BOOL set_share_mode(int fnum,int mode);
-int DSTDiff(time_t t);
 void TimeInit(void);
 void put_long_date(char *p,time_t t);
 time_t interpret_long_date(char *p);
@@ -822,14 +821,12 @@ int chain_reply(int type,char *inbuf,char *inbuf2,char *outbuf,char *outbuf2,int
 void close_cnum(int cnum,int uid);
 char *smb_errstr(char *inbuf);
 void GetTimeOfDay(struct timeval *tval);
-struct tm *LocalTime(time_t *t,int);
+struct tm *LocalTime(time_t *t);
 int TimeDiff(time_t t);
 BOOL set_filetime(char *fname,time_t mtime);
 char *dirname_dos(char *path,char *buf);
 BOOL get_myname(char *myname,struct in_addr *ip);
 void expand_mask(char *Mask, BOOL);
-BOOL sane_unix_date(time_t unixdate);
-time_t start_of_month(void);
 char *smb_fn_name(int cnum);
 void get_machine_info(void);
 int open_socket_in(int type, int port, int dlevel);
@@ -966,7 +963,8 @@ enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANM
 enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER};
 
 /* printing types */
-enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,PRINT_QNX};
+enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
+		     PRINT_QNX,PRINT_PLP};
 
 
 /* case handling */