luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated

Browse Source 
2004-08-06  Hans Breuer  <hans@breuer.org>

	* glib/makefile.msc.in glib/glib.def : updated

	* glib/gutils.c : avoid 'inconsitent dll linkage' by not
	defining extern char** environ with msvc
This commit is contained in:
Hans Breuer 2004-08-06 18:22:46 +00:00 committed by Hans Breuer
parent b324ed6804
commit 838a02bc3f
8 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-08-06 Hans Breuer <hans@breuer.org>
* glib/makefile.msc.in glib/glib.def : updated
* glib/gutils.c : avoid 'inconsitent dll linkage' by not
defining extern char** environ with msvc
2004-08-06 Matthias Clasen <mclasen@redhat.com> 2004-08-06 Matthias Clasen <mclasen@redhat.com>
* m4macros/glib-gettext.m4: Require ngettext. (#123847, * m4macros/glib-gettext.m4: Require ngettext. (#123847,

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2004-08-06 Hans Breuer <hans@breuer.org>
* glib/makefile.msc.in glib/glib.def : updated
* glib/gutils.c : avoid 'inconsitent dll linkage' by not
defining extern char** environ with msvc
2004-08-06 Matthias Clasen <mclasen@redhat.com> 2004-08-06 Matthias Clasen <mclasen@redhat.com>
* m4macros/glib-gettext.m4: Require ngettext. (#123847, * m4macros/glib-gettext.m4: Require ngettext. (#123847,

7
ChangeLog.pre-2-12
View File

@ -1,3 +1,10 @@
2004-08-06 Hans Breuer <hans@breuer.org>
* glib/makefile.msc.in glib/glib.def : updated
* glib/gutils.c : avoid 'inconsitent dll linkage' by not
defining extern char** environ with msvc
2004-08-06 Matthias Clasen <mclasen@redhat.com> 2004-08-06 Matthias Clasen <mclasen@redhat.com>
* m4macros/glib-gettext.m4: Require ngettext. (#123847, * m4macros/glib-gettext.m4: Require ngettext. (#123847,

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
2004-08-06 Hans Breuer <hans@breuer.org>
* glib/makefile.msc.in glib/glib.def : updated
* glib/gutils.c : avoid 'inconsitent dll linkage' by not
defining extern char** environ with msvc
2004-08-06 Matthias Clasen <mclasen@redhat.com> 2004-08-06 Matthias Clasen <mclasen@redhat.com>
* m4macros/glib-gettext.m4: Require ngettext. (#123847, * m4macros/glib-gettext.m4: Require ngettext. (#123847,

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
2004-08-06 Hans Breuer <hans@breuer.org>
* glib/makefile.msc.in glib/glib.def : updated
* glib/gutils.c : avoid 'inconsitent dll linkage' by not
defining extern char** environ with msvc
2004-08-06 Matthias Clasen <mclasen@redhat.com> 2004-08-06 Matthias Clasen <mclasen@redhat.com>
* m4macros/glib-gettext.m4: Require ngettext. (#123847, * m4macros/glib-gettext.m4: Require ngettext. (#123847,

20
glib/glib.def
View File

@ -401,6 +401,25 @@ EXPORTS
g_on_error_query g_on_error_query
g_on_error_stack_trace g_on_error_stack_trace
g_once_impl g_once_impl
g_option_context_add_group
g_option_context_add_main_entries
g_option_context_error_quark
g_option_context_free
g_option_context_get_help_enabled
g_option_context_get_ignore_unknown_options
g_option_context_get_main_group
g_option_context_new
g_option_context_parse
g_option_context_set_help_enabled
g_option_context_set_ignore_unknown_options
g_option_context_set_main_group
g_option_group_add_entries
g_option_group_free
g_option_group_new
g_option_group_set_error_hook
g_option_group_set_parse_hooks
g_option_group_set_translate_func
g_option_group_set_translation_domain
g_parse_debug_string g_parse_debug_string
g_path_get_basename g_path_get_basename
g_path_get_dirname g_path_get_dirname
@ -800,6 +819,7 @@ EXPORTS
g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory
g_win32_getlocale g_win32_getlocale
glib_binary_age glib_binary_age
glib_check_version
glib_interface_age glib_interface_age
glib_major_version glib_major_version
glib_mem_profiler_table glib_mem_profiler_table

6
glib/gutils.c
View File

@ -821,7 +821,13 @@ g_setenv (const gchar *variable,
/* According to the Single Unix Specification, environ is not in /* According to the Single Unix Specification, environ is not in
* any system header, although unistd.h often declares it. * any system header, although unistd.h often declares it.
*/ */
# ifndef _MSC_VER
/*
* Win32 - at least msvc headers declare it so let's avoid
* warning C4273: '__p__environ' : inconsistent dll linkage. dllexport assumed.
*/
extern char **environ; extern char **environ;
# endif
#endif #endif
/** /**

1
glib/makefile.msc.in
View File

@ -48,6 +48,7 @@ glib_OBJECTS = \
gmem.obj \ gmem.obj \
gmessages.obj \ gmessages.obj \
gnode.obj \ gnode.obj \
goption.obj \
gprimes.obj \ gprimes.obj \
gqsort.obj \ gqsort.obj \
gqueue.obj \ gqueue.obj \