summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2002-10-29 17:31:00 +0000
committerJelmer Vernooij <jelmer@samba.org>2002-10-29 17:31:00 +0000
commit2f367b091ed11b095bc52c594df006ea9ffa9be4 (patch)
tree7c0ac06c65d28e231bc9557871f572ae75cd20d5 /source3
parent1bd97040d1d4d2047d56af46fb2908e46ec450a0 (diff)
downloadsamba-2f367b091ed11b095bc52c594df006ea9ffa9be4.tar.gz
samba-2f367b091ed11b095bc52c594df006ea9ffa9be4.tar.bz2
samba-2f367b091ed11b095bc52c594df006ea9ffa9be4.zip
Sync with HEAD
(This used to be commit a64affffb2acf68956dc25be45c0559e6139a571)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/includes.h5
-rw-r--r--source3/lib/getsmbpass.c2
2 files changed, 1 insertions, 6 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 56b8357831..01b9f14979 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -823,11 +823,6 @@ struct printjob;
#define QSORT_CAST (int (*)(const void *, const void *))
#endif
-/* this guess needs to be improved (tridge) */
-#if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV)
-#define SYSV 1
-#endif
-
#ifndef DEFAULT_PRINTING
#ifdef HAVE_CUPS
#define DEFAULT_PRINTING PRINT_CUPS
diff --git a/source3/lib/getsmbpass.c b/source3/lib/getsmbpass.c
index 0874529d32..c271d55404 100644
--- a/source3/lib/getsmbpass.c
+++ b/source3/lib/getsmbpass.c
@@ -83,7 +83,7 @@ static int tcsetattr(int fd, int flags, struct sgttyb *t)
static struct termios t;
#endif /* SYSV_TERMIO */
-char *getsmbpass(char *prompt)
+char *getsmbpass(char *prompt)
{
FILE *in, *out;
int echo_off;