updated

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

diff --git a/ChangeLog b/ChangeLog
index 0b5af3c..98e9101 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * m4macros/glib-gettext.m4: Require ngettext.  (#123847,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0b5af3c..98e9101 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * m4macros/glib-gettext.m4: Require ngettext.  (#123847,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0b5af3c..98e9101 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
        * m4macros/glib-gettext.m4: Require ngettext.  (#123847,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0b5af3c..98e9101 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * m4macros/glib-gettext.m4: Require ngettext.  (#123847,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0b5af3c..98e9101 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * m4macros/glib-gettext.m4: Require ngettext.  (#123847,

diff --git a/glib/glib.def b/glib/glib.def
index 086f20d..733b0c8 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -401,6 +401,25 @@ EXPORTS
        g_on_error_query
        g_on_error_stack_trace
        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_path_get_basename
        g_path_get_dirname
@@ -800,6 +819,7 @@ EXPORTS
        g_win32_get_package_installation_subdirectory
        g_win32_getlocale
        glib_binary_age
+       glib_check_version
        glib_interface_age
        glib_major_version
        glib_mem_profiler_table

diff --git a/glib/gutils.c b/glib/gutils.c
index 347b7cf..366c044 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -821,7 +821,13 @@ g_setenv (const gchar *variable,
 /* According to the Single Unix Specification, environ is not in 
  * 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;
+#  endif
 #endif
            
 /**

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 4391d05..77a77d1 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -48,6 +48,7 @@ glib_OBJECTS =                        \
        gmem.obj                \
        gmessages.obj           \
        gnode.obj               \
+       goption.obj     \
        gprimes.obj             \
        gqsort.obj              \
        gqueue.obj              \