removed #include <unistd.h> sneaked in by sopwith in november.

Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>

        * gcompletion.h: removed #include <unistd.h> sneaked in by
        sopwith in november.

diff --git a/ChangeLog b/ChangeLog
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 002b4263a1ede0e0391c05c21bca7982bdd1b584..53aaa594da982b468361f2bd98f9a5cae1396cd2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue May  8 15:33:31 2001  Tim Janik  <timj@gtk.org>
+
+       * gcompletion.h: removed #include <unistd.h> sneaked in by
+       sopwith in november.
+
 2001-05-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmain.c, gthread.c, gthread.h: Moved func and arg members from

diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index a7768c73393efb09ae48e1ac2e2ca7ed613baed0..994ffb73084ffa3a8f1eff2538277a36cd181022 100644 (file)
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -66,6 +66,7 @@ only one statement is expected by the compiler.
 Portable way to copy <type>va_list</type> variables.
 </para>
 
+<!-- # Unused Parameters # -->
 @ap1: the <type>va_list</type> variable to place a copy of @ap2 in.
 @ap2: a <type>va_list</type>.
 

diff --git a/gcompletion.h b/gcompletion.h
index d5fca3f3af4495a357db4fa5d0480d3b4a0e83d2..9291a02b37f113bb88867856b5c7ca705aababd2 100644 (file)
--- a/gcompletion.h
+++ b/gcompletion.h
@@ -29,9 +29,6 @@
 
 #include <glist.h>
 #include <stddef.h>            /* For size_t */
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#endif
 
 G_BEGIN_DECLS
 
@@ -42,7 +39,9 @@ typedef gchar*          (*GCompletionFunc)      (gpointer);
 /* GCompletion
  */
 
-typedef int (*GCompletionStrncmpFunc)(const char *s1, const char *s2, size_t n);
+typedef gint (*GCompletionStrncmpFunc) (const gchar *s1,
+                                       const gchar *s2,
+                                       size_t       n);
 
 struct _GCompletion
 {

diff --git a/glib/gcompletion.h b/glib/gcompletion.h
index d5fca3f3af4495a357db4fa5d0480d3b4a0e83d2..9291a02b37f113bb88867856b5c7ca705aababd2 100644 (file)
--- a/glib/gcompletion.h
+++ b/glib/gcompletion.h
@@ -29,9 +29,6 @@
 
 #include <glist.h>
 #include <stddef.h>            /* For size_t */
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#endif
 
 G_BEGIN_DECLS
 
@@ -42,7 +39,9 @@ typedef gchar*          (*GCompletionFunc)      (gpointer);
 /* GCompletion
  */
 
-typedef int (*GCompletionStrncmpFunc)(const char *s1, const char *s2, size_t n);
+typedef gint (*GCompletionStrncmpFunc) (const gchar *s1,
+                                       const gchar *s2,
+                                       size_t       n);
 
 struct _GCompletion
 {