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

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

diff --git a/gerror.h b/gerror.h
index a3a07d4..a7eb8fd 100644 (file)
--- a/gerror.h
+++ b/gerror.h
@@ -3,28 +3,27 @@
  *  Copyright 2000 Red Hat, Inc.
  *
  * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
+ * modify it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  * The Gnome Library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
  * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  *   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__ */