gmodule: New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST).

[platform/upstream/glib.git] / gerror.h

diff --git a/gerror.h b/gerror.h
index 7eafa94..a7eb8fd 100644 (file)
--- a/gerror.h
+++ b/gerror.h
@@ -18,13 +18,12 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GERROR_H__
-#define __GERROR_H__
+#ifndef __G_ERROR_H__
+#define __G_ERROR_H__
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+#include <gquark.h>
+
+G_BEGIN_DECLS
 
 typedef struct _GError GError;
 
@@ -60,13 +59,16 @@ void     g_set_error           (GError       **err,
                                 const gchar   *format,
                                 ...) G_GNUC_PRINTF (4, 5);
 
+/* if (dest) *dest = src; also has some sanity checks.
+ */
+void     g_propagate_error     (GError       **dest,
+                               GError        *src);
+
 /* if (err && *err) { g_error_free(*err); *err = NULL; } */
 void     g_clear_error         (GError       **err);
 
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
-#endif /* __GERROR_H__ */
+#endif /* __G_ERROR_H__ */