The real Windows solution. This generate one more dependence when
building on Windows (to the shlwapi.lib). This commit was SVN r15267.
Этот коммит содержится в:
родитель
684aa1bc9f
Коммит
1701013dd0
@ -22,6 +22,9 @@
|
|||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(__WINDOWS__)
|
||||||
|
#include <shlwapi.h>
|
||||||
|
#endif /* defined(__WINDOWS__) */
|
||||||
|
|
||||||
#include "opal/util/path.h"
|
#include "opal/util/path.h"
|
||||||
#include "opal/util/os_path.h"
|
#include "opal/util/os_path.h"
|
||||||
@ -304,7 +307,7 @@ char* opal_find_absolute_path( char* app_name )
|
|||||||
#if !defined(__WINDOWS__)
|
#if !defined(__WINDOWS__)
|
||||||
realpath( abs_app_name, resolved_path );
|
realpath( abs_app_name, resolved_path );
|
||||||
#else
|
#else
|
||||||
_fullpath( resolved_path, abs_app_name, PATH_MAX );
|
PathCanonicalize(resolved_path, abs_app_name);
|
||||||
#endif /* !defined(__WINDOWS__) */
|
#endif /* !defined(__WINDOWS__) */
|
||||||
if( abs_app_name != app_name ) free(abs_app_name);
|
if( abs_app_name != app_name ) free(abs_app_name);
|
||||||
return strdup(resolved_path);
|
return strdup(resolved_path);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user