Make public. (#155589, Tim-Philipp Müller)

2004-10-17  Matthias Clasen  <mclasen@redhat.com>

	* glib/gutils.h (G_IS_DIR_SEPARATOR):
	* glib/gutils.c: Make public.  (#155589, Tim-Philipp Müller)

diff --git a/ChangeLog b/ChangeLog
index 0187bb29b7f88c0473ae34200fe5c83f5996894d..00de45dde1b06bfff02b2a2b7634d7a118bd2ff3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.h (G_IS_DIR_SEPARATOR): 
+       * glib/gutils.c: Make public.  (#155589, Tim-Philipp Müller) 
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmain.c (g_child_watch_add_full): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0187bb29b7f88c0473ae34200fe5c83f5996894d..00de45dde1b06bfff02b2a2b7634d7a118bd2ff3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.h (G_IS_DIR_SEPARATOR): 
+       * glib/gutils.c: Make public.  (#155589, Tim-Philipp Müller) 
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmain.c (g_child_watch_add_full): 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0187bb29b7f88c0473ae34200fe5c83f5996894d..00de45dde1b06bfff02b2a2b7634d7a118bd2ff3 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-10-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.h (G_IS_DIR_SEPARATOR): 
+       * glib/gutils.c: Make public.  (#155589, Tim-Philipp Müller) 
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmain.c (g_child_watch_add_full): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0187bb29b7f88c0473ae34200fe5c83f5996894d..00de45dde1b06bfff02b2a2b7634d7a118bd2ff3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.h (G_IS_DIR_SEPARATOR): 
+       * glib/gutils.c: Make public.  (#155589, Tim-Philipp Müller) 
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmain.c (g_child_watch_add_full): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0187bb29b7f88c0473ae34200fe5c83f5996894d..00de45dde1b06bfff02b2a2b7634d7a118bd2ff3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.h (G_IS_DIR_SEPARATOR): 
+       * glib/gutils.c: Make public.  (#155589, Tim-Philipp Müller) 
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gmain.c (g_child_watch_add_full): 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 9528fdb1672b5a558167fa5be3adb7cdefc5a59f..21ba1db6d25b65c273e92c5ad4f3c8629d6ba2ba 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/tmpl/macros.sgml: 
+       * glib/glib-sections.txt: Document G_IS_DIR_SEPARATOR. 
+
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * gobject/tmpl/objects.sgml: Improve the docs for

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index c3e5926bc679f681630f016a1e4b497d3208947d..59ab696d7ab5944cb5a0a22ecb352c465704542f 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -122,6 +122,7 @@ G_OS_UNIX
 <SUBSECTION>
 G_DIR_SEPARATOR
 G_DIR_SEPARATOR_S
+G_IS_DIR_SEPARATOR
 G_SEARCHPATH_SEPARATOR
 G_SEARCHPATH_SEPARATOR_S
 

diff --git a/docs/reference/glib/tmpl/macros.sgml b/docs/reference/glib/tmpl/macros.sgml
index 2c498edb29e135de62ff7a897d1316172af93430..131bc02fae070a0de3342cb5a20a6c423a1a061f 100644 (file)
--- a/docs/reference/glib/tmpl/macros.sgml
+++ b/docs/reference/glib/tmpl/macros.sgml
@@ -54,6 +54,17 @@ This is "/" on UNIX machines and "\" under Windows.
 
 
 
+<!-- ##### MACRO G_IS_DIR_SEPARATOR ##### -->
+<para>
+Checks whether a character is a directory 
+separator. It returns %TRUE for '/' on UNIX
+machines and for '\' or '/' under Windows.
+</para>
+
+@c: a character
+@Since: 2.6
+
+
 <!-- ##### MACRO G_SEARCHPATH_SEPARATOR ##### -->
 <para>
 The search path separator character.

diff --git a/glib/gutils.c b/glib/gutils.c
index 83a753c2518705dd3f79e2384d5670daf868d688..6a1fea6acc781148f9bd75779768821e0e4b0afb 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -88,13 +88,6 @@
 #include <libintl.h>
 #endif
 
-/* G_IS_DIR_SEPARATOR probably should be made public in GLib 2.4 */
-#ifdef G_OS_WIN32
-#define G_IS_DIR_SEPARATOR(c) (c == G_DIR_SEPARATOR || c == '/')
-#else
-#define G_IS_DIR_SEPARATOR(c) (c == G_DIR_SEPARATOR)
-#endif
-
 const guint glib_major_version = GLIB_MAJOR_VERSION;
 const guint glib_minor_version = GLIB_MINOR_VERSION;
 const guint glib_micro_version = GLIB_MICRO_VERSION;

diff --git a/glib/gutils.h b/glib/gutils.h
index c8ba172ac0e60cec5c8995c346b0c2bc3467f696..03eaa17a07da64213339d325b505f34483a11116 100644 (file)
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -39,6 +39,7 @@ G_BEGIN_DECLS
  */
 #define G_DIR_SEPARATOR '\\'
 #define G_DIR_SEPARATOR_S "\\"
+#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
 #define G_SEARCHPATH_SEPARATOR ';'
 #define G_SEARCHPATH_SEPARATOR_S ";"
 
@@ -48,6 +49,7 @@ G_BEGIN_DECLS
 
 #define G_DIR_SEPARATOR '/'
 #define G_DIR_SEPARATOR_S "/"
+#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
 #define G_SEARCHPATH_SEPARATOR ':'
 #define G_SEARCHPATH_SEPARATOR_S ":"