diff options
| author | nyamatongwe <devnull@localhost> | 2013-05-23 15:43:27 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2013-05-23 15:43:27 +1000 |
| commit | b77531466b99bf70358658e0e33b4288be436fea (patch) | |
| tree | c1307c22335a4c6f03db24856718a8f89b4bcd9d | |
| parent | 531d265fdf0c00e09eb2415ce93480369a2f46ce (diff) | |
| download | scintilla-mirror-b77531466b99bf70358658e0e33b4288be436fea.tar.gz | |
Switch to calls compatible with old compilers/run times so that cross compiling
Linux -> OS X works.
From Mitchell Foral.
| -rw-r--r-- | gtk/PlatGTK.cxx | 6 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 1227452b8..0ea2ba8ec 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1881,7 +1881,7 @@ void ListBoxX::SetList(const char *listText, char separator, char typesep) { Clear(); int count = strlen(listText) + 1; std::vector<char> words(listText, listText+count); - char *startword = words.data(); + char *startword = &words[0]; char *numword = NULL; int i = 0; for (; words[i]; i++) { @@ -1890,10 +1890,10 @@ void ListBoxX::SetList(const char *listText, char separator, char typesep) { if (numword) *numword = '\0'; Append(startword, numword?atoi(numword + 1):-1); - startword = words.data() + i + 1; + startword = &words[0] + i + 1; numword = NULL; } else if (words[i] == typesep) { - numword = words.data() + i; + numword = &words[0] + i; } } if (startword) { diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 4632dbe96..f744d4fbd 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1554,7 +1554,7 @@ void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) { const char *data = reinterpret_cast<const char *>(DataOfGSD(selection_data)); std::vector<char> drop(data, data + LengthOfGSD(selection_data)); drop.push_back('\0'); - NotifyURIDropped(drop.data()); + NotifyURIDropped(&drop[0]); } else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8)) { if (TypeOfGSD(selection_data) > 0) { SelectionText selText; |