diff options
| author | Greg Ercolano <erco@seriss.com> | 2020-07-21 20:15:41 -0700 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2020-08-01 14:19:40 -0700 |
| commit | 2141c63628a831d3f53dad7035c94028f8d0d629 (patch) | |
| tree | 614cb7b627da2decbb7cfe49c081f9d7b4140c58 /src/drivers/Android | |
| parent | 7514a73ba759f7fc9965eeef3b92ece899bd7a69 (diff) | |
Implement + deploy fl_strdup()
Diffstat (limited to 'src/drivers/Android')
| -rw-r--r-- | src/drivers/Android/Fl_Android_Application.cxx | 3 | ||||
| -rw-r--r-- | src/drivers/Android/Fl_Android_System_Driver.H | 3 | ||||
| -rw-r--r-- | src/drivers/Android/Fl_Android_System_Driver.cxx | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/drivers/Android/Fl_Android_Application.cxx b/src/drivers/Android/Fl_Android_Application.cxx index 87053543a..793ebb5a1 100644 --- a/src/drivers/Android/Fl_Android_Application.cxx +++ b/src/drivers/Android/Fl_Android_Application.cxx @@ -25,6 +25,7 @@ #include <FL/platform.H> #include <FL/fl_draw.H> +#include <FL/fl_string.h> #include <jni.h> @@ -376,7 +377,7 @@ void *Fl_Android_Application::thread_entry(void* param) pthread_cond_broadcast(&pCond); pthread_mutex_unlock(&pMutex); - char *argv[] = { strdup(pActivity->obbPath), 0 }; + char *argv[] = { fl_strdup(pActivity->obbPath), 0 }; main(1, argv); destroy(); diff --git a/src/drivers/Android/Fl_Android_System_Driver.H b/src/drivers/Android/Fl_Android_System_Driver.H index 198d7a2b3..84f8262a4 100644 --- a/src/drivers/Android/Fl_Android_System_Driver.H +++ b/src/drivers/Android/Fl_Android_System_Driver.H @@ -22,6 +22,7 @@ #ifndef FL_ANDROID_SYSTEM_DRIVER_H #define FL_ANDROID_SYSTEM_DRIVER_H +#include <FL/fl_string.h> #include "../../Fl_System_Driver.H" #include <stdarg.h> @@ -46,7 +47,7 @@ public: virtual void fatal(const char *format, va_list args); virtual char *utf2mbcs(const char *s); virtual char *getenv(const char *var); - virtual int putenv(const char *var) { return ::putenv(strdup(var)); } + virtual int putenv(const char *var) { return ::putenv(fl_strdup(var)); } virtual int open(const char *fnam, int oflags, int pmode); virtual int open_ext(const char *fnam, int binary, int oflags, int pmode); virtual FILE *fopen(const char *fnam, const char *mode); diff --git a/src/drivers/Android/Fl_Android_System_Driver.cxx b/src/drivers/Android/Fl_Android_System_Driver.cxx index 0fa9671c5..d25e96425 100644 --- a/src/drivers/Android/Fl_Android_System_Driver.cxx +++ b/src/drivers/Android/Fl_Android_System_Driver.cxx @@ -18,6 +18,7 @@ #include "Fl_Android_System_Driver.H" #include <FL/Fl.H> #include <FL/fl_utf8.h> +#include <FL/fl_string.h> #include <FL/filename.H> #include <FL/Fl_File_Browser.H> #include <FL/Fl_File_Icon.H> @@ -545,7 +546,7 @@ Fl_WinAPI_System_Driver::filename_relative(char *to, // O - Relative filename char *newslash; // Directory separator const char *slash; // Directory separator char *cwd = 0L, *cwd_buf = 0L; - if (base) cwd = cwd_buf = strdup(base); + if (base) cwd = cwd_buf = fl_strdup(base); // return if "from" is not an absolute path if (from[0] == '\0' || |