summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2013-07-08 10:46:15 +0400
committerAlexander Barkov <bar@mariadb.org>2013-07-08 10:46:15 +0400
commit269fd01bc13c14ccec9ceed5ff324d5a67adf7ad (patch)
tree522c46f053e68287f75a338102ee4247072811cd /storage
parente2461d47cbb62c8b804ce72dfc521f963786997a (diff)
downloadmariadb-git-269fd01bc13c14ccec9ceed5ff324d5a67adf7ad.tar.gz
fixing warnings:
- no previous declaration for ‘_isatty’ - implicit declaration of function ‘_isatty’ modified: storage/connect/fmdlex.c storage/connect/osutil.c
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/fmdlex.c4
-rw-r--r--storage/connect/osutil.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/storage/connect/fmdlex.c b/storage/connect/fmdlex.c
index 669104b4425..d55b4661426 100644
--- a/storage/connect/fmdlex.c
+++ b/storage/connect/fmdlex.c
@@ -24,6 +24,9 @@
#define __STDC__ 1
#endif
#include <stdio.h>
+#ifndef defined(WIN32)
+#include <unistd.h>
+#endif
/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -392,7 +395,6 @@ char *yytext;
#include <string.h>
#include "preparse.h"
-#define isatty _isatty
#define fileno _fileno
#undef YY_DECL
#define YY_DECL int yylex YY_PROTO((PDTP ppp))
diff --git a/storage/connect/osutil.c b/storage/connect/osutil.c
index 9a7575b3258..4cdd7c560f0 100644
--- a/storage/connect/osutil.c
+++ b/storage/connect/osutil.c
@@ -202,11 +202,6 @@ BOOL MessageBeep(uint i)
return TRUE;
} /* end of MessageBeep */
-int _isatty(int fileNo)
- {
- return isatty(fileNo);
- } /* end of _isatty */
-
#if 0
/* This function is ridiculous and should be revisited */
DWORD FormatMessage(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId,