Commit b359ff37 authored by unknown's avatar unknown

Correcting signature for my_strndup to be able to build on Windows

in pushbuild on Replication/Backup team tree.


include/my_sys.h:
  Using "char" instead of "byte" for my_strndup().
mysys/safemalloc.c:
  Using "char" instead of "byte" for my_strndup().
parent cbc9ddea
...@@ -163,7 +163,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags); ...@@ -163,7 +163,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags);
extern void my_no_flags_free(gptr ptr); extern void my_no_flags_free(gptr ptr);
extern gptr my_memdup(const byte *from,uint length,myf MyFlags); extern gptr my_memdup(const byte *from,uint length,myf MyFlags);
extern char *my_strdup(const char *from,myf MyFlags); extern char *my_strdup(const char *from,myf MyFlags);
extern char *my_strndup(const byte *from, uint length, extern char *my_strndup(const char *from, uint length,
myf MyFlags); myf MyFlags);
/* we do use FG (as a no-op) in below so that a typo on FG is caught */ /* we do use FG (as a no-op) in below so that a typo on FG is caught */
#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR)) #define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
...@@ -587,7 +587,7 @@ extern gptr _my_memdup(const byte *from,uint length, ...@@ -587,7 +587,7 @@ extern gptr _my_memdup(const byte *from,uint length,
const char *sFile, uint uLine,myf MyFlag); const char *sFile, uint uLine,myf MyFlag);
extern my_string _my_strdup(const char *from, const char *sFile, uint uLine, extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,
myf MyFlag); myf MyFlag);
extern char *_my_strndup(const byte *from, uint length, extern char *_my_strndup(const char *from, uint length,
const char *sFile, uint uLine, const char *sFile, uint uLine,
myf MyFlag); myf MyFlag);
......
...@@ -525,7 +525,7 @@ char *_my_strdup(const char *from, const char *filename, uint lineno, ...@@ -525,7 +525,7 @@ char *_my_strdup(const char *from, const char *filename, uint lineno,
} /* _my_strdup */ } /* _my_strdup */
char *_my_strndup(const byte *from, uint length, char *_my_strndup(const char *from, uint length,
const char *filename, uint lineno, const char *filename, uint lineno,
myf MyFlags) myf MyFlags)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment