gio/tests/socket: add some missing g_assert_no_error()s

[platform/upstream/glib.git] / gio / gioerror.h

diff --git a/gio/gioerror.h b/gio/gioerror.h
index c4606fc..035e9e2 100644 (file)
--- a/gio/gioerror.h
+++ b/gio/gioerror.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -23,56 +21,33 @@
 #ifndef __G_IO_ERROR_H__
 #define __G_IO_ERROR_H__
 
-#include <glib/gerror.h>
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
 
-G_BEGIN_DECLS
+#include <glib.h>
+#include <gio/gioenums.h>
 
-GQuark          g_io_error_quark      (void);
+G_BEGIN_DECLS
 
+/**
+ * G_IO_ERROR:
+ *
+ * Error domain for GIO. Errors in this domain will be from the #GIOErrorEnum enumeration.
+ * See #GError for more information on error domains.
+ **/
 #define G_IO_ERROR g_io_error_quark()
 
-/* This enumeration conflicts with GIOError in giochannel.h. However,
- * that is only used as a return value in some deprecated functions.
- * So, we reuse the same prefix for the enumeration values, but call
- * the actual enumeration (which is rarely used) GIOErrorEnum.
- */
-
-typedef enum
-{
-  G_IO_ERROR_FAILED,
-  G_IO_ERROR_NOT_FOUND,
-  G_IO_ERROR_EXISTS,
-  G_IO_ERROR_IS_DIRECTORY,
-  G_IO_ERROR_NOT_DIRECTORY,
-  G_IO_ERROR_NOT_EMPTY,
-  G_IO_ERROR_NOT_REGULAR_FILE,
-  G_IO_ERROR_NOT_SYMBOLIC_LINK,
-  G_IO_ERROR_NOT_MOUNTABLE_FILE,
-  G_IO_ERROR_FILENAME_TOO_LONG,
-  G_IO_ERROR_INVALID_FILENAME,
-  G_IO_ERROR_TOO_MANY_LINKS,
-  G_IO_ERROR_NO_SPACE,
-  G_IO_ERROR_INVALID_ARGUMENT,
-  G_IO_ERROR_PERMISSION_DENIED,
-  G_IO_ERROR_NOT_SUPPORTED,
-  G_IO_ERROR_NOT_MOUNTED,
-  G_IO_ERROR_ALREADY_MOUNTED,
-  G_IO_ERROR_CLOSED,
-  G_IO_ERROR_CANCELLED,
-  G_IO_ERROR_PENDING,
-  G_IO_ERROR_READ_ONLY,
-  G_IO_ERROR_CANT_CREATE_BACKUP,
-  G_IO_ERROR_WRONG_ETAG,
-  G_IO_ERROR_TIMED_OUT,
-  G_IO_ERROR_WOULD_RECURSE,
-  G_IO_ERROR_BUSY,
-  G_IO_ERROR_WOULD_BLOCK,
-  G_IO_ERROR_HOST_NOT_FOUND,
-  G_IO_ERROR_WOULD_MERGE
-} GIOErrorEnum;
-
+GLIB_AVAILABLE_IN_ALL
+GQuark       g_io_error_quark      (void);
+GLIB_AVAILABLE_IN_ALL
 GIOErrorEnum g_io_error_from_errno (gint err_no);
 
+#ifdef G_OS_WIN32
+GLIB_AVAILABLE_IN_ALL
+GIOErrorEnum g_io_error_from_win32_error (gint error_code);
+#endif
+
 G_END_DECLS
 
 #endif /* __G_IO_ERROR_H__ */