summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2016-01-04 23:31:55 +0000
committerMatthias Melcher <fltk@matthiasm.com>2016-01-04 23:31:55 +0000
commit19c8c9b9180e599a6b5bd3933e4e008632f8ce5a (patch)
tree4782de4354d7ab6fa85b1a9eea1680c2dbb41bed
parent64aa17ca09cda7696c4d404884ee7e3f4540c2d1 (diff)
Compiling in OS X from the command line goes pretty far for __APPLE__ undefined and FL_PORTING defined.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10995 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_PostScript.cxx9
-rw-r--r--src/fl_utf8.cxx25
2 files changed, 34 insertions, 0 deletions
diff --git a/src/Fl_PostScript.cxx b/src/Fl_PostScript.cxx
index d2264a8c7..9ad6b2173 100644
--- a/src/Fl_PostScript.cxx
+++ b/src/Fl_PostScript.cxx
@@ -155,6 +155,14 @@ Fl_PostScript_File_Device::~Fl_PostScript_File_Device() {
*/
int Fl_PostScript_Graphics_Driver::clocale_printf(const char *format, ...)
{
+#ifdef FL_PORTING
+# pragma message "FL_PORTING: must define LC_NUMERIC"
+ va_list args;
+ va_start(args, format);
+ int retval = vfprintf(output, format, args);
+ va_end(args);
+ return retval;
+#else
char *saved_locale = setlocale(LC_NUMERIC, NULL);
setlocale(LC_NUMERIC, "C");
va_list args;
@@ -163,6 +171,7 @@ int Fl_PostScript_Graphics_Driver::clocale_printf(const char *format, ...)
va_end(args);
setlocale(LC_NUMERIC, saved_locale);
return retval;
+#endif
}
#ifndef FL_DOXYGEN
diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx
index 9ddc73dd0..be77bb3fc 100644
--- a/src/fl_utf8.cxx
+++ b/src/fl_utf8.cxx
@@ -490,6 +490,11 @@ int fl_open(const char* f, int oflags, ...)
if (pmode == -1) return _wopen(wbuf, oflags);
else return _wopen(wbuf, oflags, pmode);
+#elif defined(FL_PORTING)
+
+# pragma message "FL_PORTING: implement utf8 version of fl_open."
+ return -1;
+
#else
if (pmode == -1) return open(f, oflags);
@@ -604,6 +609,11 @@ int fl_execvp(const char *file, char *const *argv)
return -1; // STR #3040
# endif
+#elif defined(FL_PORTING)
+
+# pragma message "FL_PORTING: implement utf8 version of execvp."
+ return -1;
+
#else // other platforms
return execvp(file, argv);
#endif
@@ -746,6 +756,11 @@ char *fl_getcwd(char* b, int l) {
return NULL;
}
+#elif defined(FL_PORTING)
+
+# pragma message "FL_PORTING: implement utf8 version of getcwd."
+ return 0L;
+
#else // other platforms
return getcwd(b, l);
@@ -775,6 +790,11 @@ int fl_unlink(const char* f) {
wbuf[wn] = 0;
return _wunlink(wbuf);
+#elif defined(FL_PORTING)
+
+# pragma message "FL_PORTING: implement utf8 version of fl_unlink."
+ return -1;
+
#else // other platforms
return unlink(f);
@@ -839,6 +859,11 @@ int fl_rmdir(const char* f) {
wbuf[wn] = 0;
return _wrmdir(wbuf);
+#elif defined(FL_PORTING)
+
+# pragma message "FL_PORTING: implement utf8 version of mkdir."
+ return -1;
+
#else
return rmdir(f);