summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-04-18 04:33:24 +0000
committerJeremy Allison <jra@samba.org>2001-04-18 04:33:24 +0000
commit0766f84a403354c46398690e69c138a27344aece (patch)
treea797e4c93da39585926dfe3c65343745fb3d2ac8
parenta5bd9ef712786a51089f15e034a32111bc416344 (diff)
downloadsamba-0766f84a403354c46398690e69c138a27344aece.tar.gz
samba-0766f84a403354c46398690e69c138a27344aece.tar.bz2
samba-0766f84a403354c46398690e69c138a27344aece.zip
Merge of changes from 2.2.
Jeremy. (This used to be commit df912162bbe93611c80defe830641f580687edbb)
-rw-r--r--source3/include/includes.h30
1 files changed, 30 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 325880fad9..f27d2f564f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -497,8 +497,10 @@
#ifdef LARGE_SMB_OFF_T
#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32))
+#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32))
#else
#define SOFF_T(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0))
+#define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,v),SIVAL(p,ofs,0))
#endif
/*
@@ -793,6 +795,24 @@ enum nss_status {
#define ULTRIX_AUTH 1
#endif
+#ifdef HAVE_LIBREADLINE
+# ifdef HAVE_READLINE_READLINE_H
+# include <readline/readline.h>
+# ifdef HAVE_READLINE_HISTORY_H
+# include <readline/history.h>
+# endif
+# else
+# ifdef HAVE_READLINE_H
+# include <readline.h>
+# ifdef HAVE_HISTORY_H
+# include <history.h>
+# endif
+# else
+# undef HAVE_LIBREADLINE
+# endif
+# endif
+#endif
+
#ifndef HAVE_STRDUP
char *strdup(const char *s);
#endif
@@ -916,6 +936,16 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
#define S_IXOTH 00001 /* execute permission: other */
#endif
+/* NetBSD doesn't have these */
+#ifndef SHM_R
+#define SHM_R 0400
+#endif
+
+#ifndef SHM_W
+#define SHM_W 0200
+#endif
+
+
/* Some systems (SCO) treat UNIX domain sockets as FIFOs */
#ifndef S_IFSOCK