diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2016-09-13 14:24:28 +1000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2016-09-13 14:55:02 +1000 |
commit | 3193aa93ce456549067465129006da2b685b5bdb (patch) | |
tree | b5267e80e5cf7a2969e431728736b80a7c8a437c /gtk2_ardour | |
parent | cec0c57b78334c4e2c4117802232c791ca420ce9 (diff) |
Rename Struct defined in freesound header to be less generic
This could potentially conflict with a struct declared in the
ardour/soundcloud_upload.h file.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/sfdb_freesound_mootcher.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_freesound_mootcher.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc index 74290df0a3..1f2487b5e7 100644 --- a/gtk2_ardour/sfdb_freesound_mootcher.cc +++ b/gtk2_ardour/sfdb_freesound_mootcher.cc @@ -106,7 +106,7 @@ void Mootcher::ensureWorkingDir () size_t Mootcher::WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) { int realsize = (int)(size * nmemb); - struct MemoryStruct *mem = (struct MemoryStruct *)data; + struct SfdbMemoryStruct *mem = (struct SfdbMemoryStruct *)data; mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1); @@ -161,7 +161,7 @@ void Mootcher::setcUrlOptions() std::string Mootcher::doRequest(std::string uri, std::string params) { std::string result; - struct MemoryStruct xml_page; + struct SfdbMemoryStruct xml_page; xml_page.memory = NULL; xml_page.size = 0; diff --git a/gtk2_ardour/sfdb_freesound_mootcher.h b/gtk2_ardour/sfdb_freesound_mootcher.h index bc18cefa18..c9a27c7c1c 100644 --- a/gtk2_ardour/sfdb_freesound_mootcher.h +++ b/gtk2_ardour/sfdb_freesound_mootcher.h @@ -48,7 +48,7 @@ #include "curl/curl.h" //--- struct to store XML file -struct MemoryStruct { +struct SfdbMemoryStruct { char *memory; size_t size; }; |