From 8bc7d6bebd4fcf8c95cb6d58da14404a5e46de91 Mon Sep 17 00:00:00 2001
From: Samba Release Account <samba-bugs@samba.org>
Date: Thu, 9 Jan 1997 18:02:17 +0000
Subject: Makefile: Changes to split Solaris into Solaris2.3 and previous, and
 2.4 and after from Paul Eggert. Makefile: Added AMIGA changes from Rask
 Ingemann Lambertsen <rask@k4315.kampsax.dtu.dk>. charset.c: Patch for Western
 European Languages from Josef Hinteregger <joehtg@joehtg.co.at> charset.h:
 Patch for Western European Languages from Josef Hinteregger
 <joehtg@joehtg.co.at> clitar.c: Patch to re-sync after read fail from (lost
 contributor name, sorry). includes.h: Patch for AMIGA from Rask Ingemann
 Lambertsen <rask@k4315.kampsax.dtu.dk> includes.h: Patch for SunOS atexit by
 Jeremy (jra@cygnus.com) interface.c: Patch for AMIGA from Rask Ingemann
 Lambertsen <rask@k4315.kampsax.dtu.dk> kanji.h: Patch for Western European
 Languages from Josef Hinteregger <joehtg@joehtg.co.at> locking.c: Patch to
 fix file locking from Jeremy (jra@cygnus.com) locking.c: Patch to add
 granularity of lock files to usec by Jeremy (jra@cygnus.com) pipes.c: Patch
 to fix file locking from Jeremy (jra@cygnus.com) proto.h: Patch to fix file
 locking from Jeremy (jra@cygnus.com) reply.c: Patch to fix file locking from
 Jeremy (jra@cygnus.com) server.c: Patch to fix file locking from Jeremy
 (jra@cygnus.com) server.c: Patch for FAST_SHARE_MODE fix from (lost
 contributor name, sorry). smb.h: Patch to fix file locking from Jeremy
 (jra@cygnus.com) smb.h: Patch to add granularity of lock files to usec by
 Jeremy (jra@cygnus.com) status.c: Patch to fix file locking from Jeremy
 (jra@cygnus.com) statuc.c: Patch to add granularity of lock files to usec by
 Jeremy (jra@cygnus.com) system.c: Patch for Western European Languages from
 Josef Hinteregger <joehtg@joehtg.co.at> trans2.c: Patch to fix file locking
 from Jeremy (jra@cygnus.com) trans2.c: Patch to fix volume name reported to
 Win95 from Jeremy (jra@cygnus.com) util.c: Patch for Western European
 Languages from Josef Hinteregger <joehtg@joehtg.co.at> util.c: Patch to fix
 client_name from continuously returning UNKNOWN (from various contributors).
 version.h: Update to 1.9.16p10. (This used to be commit
 03d28fa32eb094affa33133ebe2602fdb70f6361)

---
 source3/include/includes.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'source3/include/includes.h')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0b989df20d..0e93df35fd 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -259,11 +259,21 @@ typedef unsigned short mode_t;
 #include <utime.h>
 #define NO_STRERROR
 #endif
+#ifndef REPLACE_GETPASS
 #define REPLACE_GETPASS
+#endif
+#ifndef BSD_TERMIO
 #define BSD_TERMIO
+#endif
+#ifndef USE_SIGPROCMASK
 #define USE_SIGPROCMASK
+#endif
+#ifndef USE_WAITPID
 #define USE_WAITPID
 #endif
+/* SunOS doesn't have POSIX atexit */
+#define atexit on_exit
+#endif
 
 
 #ifdef SUNOS5
@@ -496,6 +506,7 @@ char *mktemp(char *); /* No standard include */
 #include <sys/id.h>
 #include <sys/priv.h>
 #include <netinet/tcp.h>
+#include <locale.h>
 #define SYSV
 #define USE_WAITPID
 #define USE_SIGBLOCK
@@ -642,6 +653,7 @@ char *mktemp(char *); /* No standard include */
 #include <sys/statfs.h>
 #include <sys/stropts.h>
 #include <limits.h>
+#include <locale.h>
 #ifdef EVEREST
 #include <unistd.h> 
 #endif
@@ -916,6 +928,38 @@ typedef int mode_t;
 #include <sys/bsdioctl.h>
 #endif
 
+#ifdef AMIGA
+#include <arpa/inet.h>
+#include <dirent.h>
+#include <string.h>
+#include <netinet/tcp.h>
+#include <sys/acct.h>
+#include <sys/fcntl.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <sys/termios.h>
+#include <limits.h>
+#include <sys/timeb.h>
+
+#define SIGNAL_CAST (void (*)(int))
+#define USE_GETCWD
+#define HAVE_BZERO
+#define HAVE_MEMMOVE
+#define USE_SIGPROCMASK
+#define USE_WAITPID
+#define USE_DIRECT
+#define USE_F_FSIZE
+#define HAVE_FCNTL_LOCK 0
+#define HAVE_GETTIMEOFDAY
+#define HAVE_PATHCONF
+
+#define HAVE_NO_PROC
+#define NO_FORK_DEBUG
+#define HAVE_FORK 0
+#define HAVE_VFORK 1
+#endif
 
 
 /*******************************************************************
-- 
cgit