gtlscertificate: Don't confuse certificate and public key in docs

[platform/upstream/glib.git] / glib / glib-unix.h

diff --git a/glib/glib-unix.h b/glib/glib-unix.h
index 55aaf25..c04f66f 100644 (file)
--- a/glib/glib-unix.h
+++ b/glib/glib-unix.h
@@ -38,35 +38,53 @@
 #error "This header may only be used on UNIX"
 #endif
 
+G_BEGIN_DECLS
+
 /**
  * G_UNIX_ERROR:
- * 
- * Error domain for API in the "g_unix_" namespace.  Note that there
- * is no exported enumeration mapping %errno.  Instead, all functions
+ *
+ * Error domain for API in the "g_unix_" namespace.  Note that there is
+ * no exported enumeration mapping %errno.  Instead, all functions
  * ensure that %errno is relevant.  The code for all #G_UNIX_ERROR is
- * always %0, and the error message is always generated via
- * g_strerror().
+ * always <literal>0</literal>, and the error message is always
+ * generated via g_strerror().
  *
  * It is expected that most code will not look at %errno from these
  * APIs. Important cases where one would want to differentiate between
  * errors are already covered by existing cross-platform GLib API,
- * such as e.g. #GFile wrapping %ENOENT.  However, it is provided for
- * completeness, at least.
+ * such as e.g. #GFile wrapping <literal>ENOENT</literal>.  However, it is
+ * provided for completeness, at least.
  */
 #define G_UNIX_ERROR (g_unix_error_quark())
 
+GLIB_AVAILABLE_IN_2_30
 GQuark g_unix_error_quark (void);
 
-gboolean g_unix_pipe_flags (int      *fds,
-                           int       flags,
-                           GError  **error);
+GLIB_AVAILABLE_IN_2_30
+gboolean g_unix_open_pipe (gint    *fds,
+                           gint     flags,
+                           GError **error);
 
-GSource *g_unix_signal_source_new     (int signum);
+GLIB_AVAILABLE_IN_2_30
+gboolean g_unix_set_fd_nonblocking (gint       fd,
+                                    gboolean   nonblock,
+                                    GError   **error);
 
-guint    g_unix_signal_add_watch_full (int            signum,
-                                      int            priority,
-                                      GSourceFunc    handler,
-                                      gpointer       user_data,
-                                      GDestroyNotify notify);
+GLIB_AVAILABLE_IN_2_30
+GSource *g_unix_signal_source_new  (gint signum);
 
-#endif
+GLIB_AVAILABLE_IN_2_30
+guint    g_unix_signal_add_full    (gint           priority,
+                                    gint           signum,
+                                    GSourceFunc    handler,
+                                    gpointer       user_data,
+                                    GDestroyNotify notify);
+
+GLIB_AVAILABLE_IN_2_30
+guint    g_unix_signal_add         (gint        signum,
+                                    GSourceFunc handler,
+                                    gpointer    user_data);
+
+G_END_DECLS
+
+#endif  /* __G_UNIX_H__ */