luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-22 04:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't build gdesktopappinfo.obj, it collides with symbols

Browse Source 
2007-12-20  Hans Breuer  <hans@breuer.org>

	* makefile.msc : don't build gdesktopappinfo.obj, it collides 
	with symbols gwin32appinfo.obj, added gmount.obj
	* gio.symbols : mark g_desktop_app_* as G_OS_UNIX


svn path=/trunk/; revision=6178
This commit is contained in:
Hans Breuer 2007-12-20 19:13:18 +00:00 committed by Hans Breuer
parent 0c99959a79
commit b64e1dfd47
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/ChangeLog
View File

@ -1,3 +1,9 @@
2007-12-20 Hans Breuer <hans@breuer.org>
* makefile.msc : don't build gdesktopappinfo.obj, it collides
with symbols gwin32appinfo.obj, added gmount.obj
* gio.symbols : mark g_desktop_app_* as G_OS_UNIX
2007-12-20 Alexander Larsson <alexl@redhat.com> 2007-12-20 Alexander Larsson <alexl@redhat.com>
* gfile.c: * gfile.c:

2
gio/gio.symbols
View File

@ -63,12 +63,14 @@ g_app_info_get_default_for_uri_scheme
#if IN_HEADER(__G_DESKTOP_APP_INFO_H__) #if IN_HEADER(__G_DESKTOP_APP_INFO_H__)
#if IN_FILE(__G_DESKTOP_APP_INFO_C__) #if IN_FILE(__G_DESKTOP_APP_INFO_C__)
#ifdef G_OS_UNIX
g_desktop_app_info_new_from_filename g_desktop_app_info_new_from_filename
g_desktop_app_info_new g_desktop_app_info_new
g_desktop_app_info_get_type G_GNUC_CONST g_desktop_app_info_get_type G_GNUC_CONST
g_desktop_app_info_get_is_hidden g_desktop_app_info_get_is_hidden
#endif #endif
#endif #endif
#endif
#if IN_HEADER(__G_ASYNC_RESULT_H__) #if IN_HEADER(__G_ASYNC_RESULT_H__)

5
gio/makefile.msc
View File

@ -22,7 +22,8 @@ INCLUDES = \
DEFINES = \ DEFINES = \
-DG_LOG_DOMAIN=\"GLib-GIO\" \ -DG_LOG_DOMAIN=\"GLib-GIO\" \
-DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
-DGIO_COMPILATION
appinfo_sources = \ appinfo_sources = \
gwin32appinfo.c gwin32appinfo.h gwin32appinfo.c gwin32appinfo.h
@ -78,6 +79,7 @@ OBJECTS = \
gcontenttype.obj \ gcontenttype.obj \
gdatainputstream.obj \ gdatainputstream.obj \
gdataoutputstream.obj \ gdataoutputstream.obj \
# gdesktopappinfo.obj \
gdirectorymonitor.obj \ gdirectorymonitor.obj \
gdrive.obj \ gdrive.obj \
gdummyfile.obj \ gdummyfile.obj \
@ -101,6 +103,7 @@ OBJECTS = \
gloadableicon.obj \ gloadableicon.obj \
gmemoryinputstream.obj \ gmemoryinputstream.obj \
gmemoryoutputstream.obj \ gmemoryoutputstream.obj \
gmount.obj \
gmountoperation.obj \ gmountoperation.obj \
gnativevolumemonitor.obj \ gnativevolumemonitor.obj \
goutputstream.obj \ goutputstream.obj \