diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2008-07-02 17:54:54 +0200 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2008-07-02 17:54:54 +0200 |
| commit | 07d0640b6101490819e3aaae0b699435944e6a78 (patch) | |
| tree | ecd93761d73fe115c5a95ca92f985ca946bc90e3 /mysys/default.c | |
| parent | d85f7bc943606cdf70f676005798023866937ab6 (diff) | |
| parent | 4b64fc147857fe8c755c3ba521ced42380280ffb (diff) | |
| download | mariadb-git-07d0640b6101490819e3aaae0b699435944e6a78.tar.gz | |
Up-merge syntax fix from 5.0-bugteam.
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index e0ab3bd1e80..7803b81c31d 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -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) { + char *last= NULL; + char *end; if (!GetModuleFileName(NULL, buf, size)) return NULL; + end= strend(buf); - char *last= NULL, *end= strend(buf); /* 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 |