summaryrefslogtreecommitdiffstats
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
commita64affffb2acf68956dc25be45c0559e6139a571 (patch)
treef372e44c00d6e841ca8ec1ede7d5804e8d599860
parent987b62137d38fc295dab75bdbc004031a99f4d56 (diff)
downloadsamba-a64affffb2acf68956dc25be45c0559e6139a571.tar.gz
samba-a64affffb2acf68956dc25be45c0559e6139a571.tar.xz
samba-a64affffb2acf68956dc25be45c0559e6139a571.zip
Sync with HEAD
-rw-r--r--source/include/includes.h5
-rw-r--r--source/lib/getsmbpass.c2
2 files changed, 1 insertions, 6 deletions
diff --git a/source/include/includes.h b/source/include/includes.h
index 56b83578312..01b9f14979d 100644
--- a/source/include/includes.h
+++ b/source/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/source/lib/getsmbpass.c b/source/lib/getsmbpass.c
index 0874529d325..c271d554047 100644
--- a/source/lib/getsmbpass.c
+++ b/source/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;