From 50ee3bcd66c4baa6bb3388f5b955d726bfc6bdd8 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Thu, 11 Feb 2016 12:02:36 +0000 Subject: Mark places that need to be refactored with // PORTME: Searching for __APPLE, WIN32 or X11 did give me many false results. I instead marked most ifdef's that I would like to get rid of with the text // PORTME:, so they can be easily found by a global search. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11155 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Preferences.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Fl_Preferences.cxx') diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx index 47c842f66..616c3c891 100644 --- a/src/Fl_Preferences.cxx +++ b/src/Fl_Preferences.cxx @@ -29,7 +29,7 @@ #include #include -#if defined(WIN32) || defined(__APPLE__) +#if defined(WIN32) || defined(__APPLE__) // PORTME: platform Preferences #elif defined(FL_PORTING) # pragma message "FL_PORTING: implement some file storage in a designated place" #else @@ -43,7 +43,7 @@ // on Windows, which is supposed to be POSIX compliant... # define access _access # define mkdir _mkdir -#elif defined (__APPLE__) +#elif defined (__APPLE__) // PORTME: platform Preferences # include # include # include @@ -86,7 +86,7 @@ Fl_Preferences *Fl_Preferences::runtimePrefs = 0; * The buffer is overwritten during every call to this function! */ const char *Fl_Preferences::newUUID() { -#ifdef __APPLE__ +#ifdef __APPLE__ // PORTME: platform Preferences CFUUIDRef theUUID = CFUUIDCreate(NULL); CFUUIDBytes b = CFUUIDGetUUIDBytes(theUUID); sprintf(uuidBuffer, "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", @@ -1026,7 +1026,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), "/%s/%s.prefs", vendor, application); for (char *s = filename; *s; s++) if (*s == '\\') *s = '/'; -#elif defined ( __APPLE__ ) +#elif defined ( __APPLE__ ) // PORTME: platform Preferences // TODO: verify that this is the Apple sanctioned way of finding these folders // (On MSWindows, this frequently leads to issues with internationalized systems) // Carbon: err = FindFolder( kLocalDomain, kPreferencesFolderType, 1, &spec.vRefNum, &spec.parID ); @@ -1168,7 +1168,7 @@ int Fl_Preferences::RootNode::write() { fprintf( f, "; application: %s\n", application_ ); prefs_->node->write( f ); fclose( f ); -#if !(defined(__APPLE__) || defined(WIN32)) +#if !(defined(__APPLE__) || defined(WIN32)) // PORTME: platform Preferences // unix: make sure that system prefs are user-readable if (strncmp(filename_, "/etc/fltk/", 10) == 0) { char *p; @@ -1197,7 +1197,7 @@ char Fl_Preferences::RootNode::getPath( char *path, int pathlen ) { if ( !s ) return 0; *s = 0; char ret = fl_make_path( path ); -#if !(defined(__APPLE__) || defined(WIN32)) +#if !(defined(__APPLE__) || defined(WIN32)) // PORTME: platform Preferences // unix: make sure that system prefs dir. is user-readable if (strncmp(path, "/etc/fltk/", 10) == 0) { fl_chmod(path, 0755); // rwxr-xr-x -- cgit v1.2.3