Added binary and unicode file i/o support to msvcrt.

[reactos.git] / reactos / lib / crtdll / search / lsearch.c

diff --git a/reactos/lib/crtdll/search/lsearch.c b/reactos/lib/crtdll/search/lsearch.c
index f388d07..8434ebb 100644 (file)
--- a/reactos/lib/crtdll/search/lsearch.c
+++ b/reactos/lib/crtdll/search/lsearch.c
@@ -1,16 +1,21 @@
-#include <crtdll/search.h>
-#include <crtdll/stdlib.h>
-#include <crtdll/string.h>
+#include <msvcrt/search.h>
+#include <msvcrt/stdlib.h>
+#include <msvcrt/string.h>
 
 void *_lsearch(const void *key, void *base, size_t *nelp, size_t width,
          int (*compar)(const void *, const void *))
 {
-       void *ret_find = _lfind(key,base,nelp,width,compar);
-       if ( ret_find != NULL )
-               return ret_find;
+  void *ret_find = _lfind(key,base,nelp,width,compar);
 
-       memcpy( base + (*nelp*width), key, width );
-        (*nelp)++;
-        return base ;
+  if (ret_find != NULL)
+    return ret_find;
+
+#ifdef __GNUC__
+  memcpy(base + (*nelp*width), key, width);
+#else
+  memcpy((int*)base + (*nelp*width), key, width);
+#endif
+  (*nelp)++;
+  return base;
 }