Imported Upstream version 2.53.3

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

diff --git a/glib/gdir.h b/glib/gdir.h
index a8085c9..8f9d6bd 100644 (file)
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -8,7 +8,7 @@
  * This library is free software; you can redistribute it and/or
  * 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.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,37 +16,35 @@
  * 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
 #ifndef __G_DIR_H__
 #define __G_DIR_H__
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #include <glib/gerror.h>
 
+#ifdef G_OS_UNIX
+#include <dirent.h>
+#endif
+
 G_BEGIN_DECLS
 
 typedef struct _GDir GDir;
 
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-/* For DLL ABI stability, keep old names for old (non-UTF-8) functionality. */
-#define g_dir_open g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-#endif
-#endif
-
+GLIB_AVAILABLE_IN_ALL
 GDir    *                g_dir_open           (const gchar  *path,
                                               guint         flags,
                                               GError      **error);
-G_CONST_RETURN gchar    *g_dir_read_name      (GDir         *dir);
+GLIB_AVAILABLE_IN_ALL
+const gchar *            g_dir_read_name      (GDir         *dir);
+GLIB_AVAILABLE_IN_ALL
 void                     g_dir_rewind         (GDir         *dir);
+GLIB_AVAILABLE_IN_ALL
 void                     g_dir_close          (GDir         *dir);
 
 G_END_DECLS