X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fglib-compile-resources.c;h=6bad64fc49d2a7eb23461a6d5e06f4a5663cbfa1;hb=4482977238ae80f64c2fe318d1500f4662c73980;hp=d7dd5801426e177b41eb4d3bec8b779ec50908e7;hpb=5b48dc40cc13567d276883ee826fe9e78bc7f46a;p=platform%2Fupstream%2Fglib.git diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c index d7dd580..6bad64f 100644 --- a/gio/glib-compile-resources.c +++ b/gio/glib-compile-resources.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, see . * * Author: Alexander Larsson */ @@ -30,6 +28,9 @@ #include #include #include +#ifdef G_OS_UNIX +#include +#endif #ifdef G_OS_WIN32 #include #endif @@ -38,10 +39,6 @@ #include #include -#ifdef HAVE_UNISTD_H -#include -#endif - #include #include "gvdb/gvdb-builder.h" @@ -191,7 +188,7 @@ find_file (const gchar *filename) /* search all the sourcedirs for the correct files in order */ for (i = 0; sourcedirs[i] != NULL; i++) { - real_file = g_build_filename (sourcedirs[i], filename, NULL); + real_file = g_build_path ("/", sourcedirs[i], filename, NULL); exists = g_file_test (real_file, G_FILE_TEST_EXISTS); if (exists) return real_file;