From 2e238f7eff665593f9161667403baabc83e15c94 Mon Sep 17 00:00:00 2001
From: "miguel@hegel.txg.br" <>
Date: Tue, 24 Aug 2004 10:40:20 -0300
Subject: [PATCH] Fix warning VC++ and fix applied fisrt to source 4.1

---
 BitKeeper/etc/logging_ok |  1 +
 mysys/my_lib.c           | 11 -----------
 mysys/my_vsnprintf.c     | 20 +++++++++-----------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index c4d6b93ffc..d16de3077f 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -68,6 +68,7 @@ miguel@hegel.(none)
 miguel@hegel.br
 miguel@hegel.local
 miguel@hegel.txg
+miguel@hegel.txg.br
 miguel@light.
 miguel@light.local
 miguel@sartre.local
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index 0207d9a368..055e00d2ef 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -461,17 +461,6 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
     else
       finfo.mystat= NULL;
 
-    /*
-      If the directory is the root directory of the drive, Windows sometimes
-      creates hidden or system files there (like RECYCLER); do not show
-      them. We would need to see how this can be achieved with a Borland
-      compiler.
-    */
-#ifndef __BORLANDC__
-    if (attrib & (_A_HIDDEN | _A_SYSTEM))
-      continue;
-#endif
-
     if (push_dynamic(dir_entries_storage, (gptr)&finfo))
       goto error;
     
diff --git a/mysys/my_vsnprintf.c b/mysys/my_vsnprintf.c
index 289c21e1ea..e7cc780060 100644
--- a/mysys/my_vsnprintf.c
+++ b/mysys/my_vsnprintf.c
@@ -33,17 +33,6 @@
     length of result string
 */
 
-int my_snprintf(char* to, size_t n, const char* fmt, ...)
-{
-  int result;
-  va_list args;
-  va_start(args,fmt);
-  result= my_vsnprintf(to, n, fmt, args);
-  va_end(args);
-  return result;
-}
-
-
 int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
 {
   char *start=to, *end=to+n-1;
@@ -140,6 +129,15 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
   return (uint) (to - start);
 }
 
+int my_snprintf(char* to, size_t n, const char* fmt, ...)
+{
+  int result;
+  va_list args;
+  va_start(args,fmt);
+  result= my_vsnprintf(to, n, fmt, args);
+  va_end(args);
+  return result;
+}
 
 #ifdef MAIN
 #define OVERRUN_SENTRY  250
-- 
2.30.9