Merge pull request #4032 from blino/clipboard-build

Fix clipboard POSIX build because of basename conflict
This commit is contained in:
David Fort 2017-07-05 22:00:33 +02:00 committed by GitHub
commit baa122434d
1 changed files with 2 additions and 2 deletions

View File

@ -394,7 +394,7 @@ static BOOL add_file_to_list(const char* local_name, const WCHAR* remote_name, w
return TRUE;
}
static const char* basename(const char* name)
static const char* get_basename(const char* name)
{
const char* c = name;
const char* last_name = name;
@ -419,7 +419,7 @@ static BOOL process_file_name(const char* local_name, wArrayList* files)
* exact files selected by the user, and we want the remote files
* to have names relative to that selection.
*/
base_name = basename(local_name);
base_name = get_basename(local_name);
remote_name = convert_local_name_component_to_remote(base_name);
if (!remote_name)