mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
Up-merge syntax fix from 5.0-bugteam.
This commit is contained in:
commit
ab9c6beccd
1 changed files with 3 additions and 1 deletions
|
|
@ -1024,10 +1024,12 @@ static size_t my_get_system_windows_directory(char *buffer, size_t size)
|
||||||
|
|
||||||
static const char *my_get_module_parent(char *buf, size_t size)
|
static const char *my_get_module_parent(char *buf, size_t size)
|
||||||
{
|
{
|
||||||
|
char *last= NULL;
|
||||||
|
char *end;
|
||||||
if (!GetModuleFileName(NULL, buf, size))
|
if (!GetModuleFileName(NULL, buf, size))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
end= strend(buf);
|
||||||
|
|
||||||
char *last= NULL, *end= strend(buf);
|
|
||||||
/*
|
/*
|
||||||
Look for the second-to-last \ in the filename, but hang on
|
Look for the second-to-last \ in the filename, but hang on
|
||||||
to a pointer after the last \ in case we're in the root of
|
to a pointer after the last \ in case we're in the root of
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue