X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgdir.h;h=6ff2455661641945b29be1e0cf0210a958556dd3;hb=1cbdbef77209fe82239bd10f062425491cf256ae;hp=85e989695ab0e5335b6c1bded4a6cb2a721ca64f;hpb=73ca8b47540d005d5227c03aac143d6780da654c;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/gdir.h b/glib/gdir.h
index 85e9896..6ff2455 100644
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -16,37 +16,49 @@
* 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 .
*/
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __G_DIR_H__
#define __G_DIR_H__
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
+#ifdef G_OS_UNIX
+#include
+#endif
+
G_BEGIN_DECLS
typedef struct _GDir GDir;
-#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
-
+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);
+#ifdef G_OS_WIN32
+#define g_dir_open g_dir_open_utf8
+#define g_dir_read_name g_dir_read_name_utf8
+
+GLIB_AVAILABLE_IN_ALL
+GDir *g_dir_open_utf8 (const gchar *path,
+ guint flags,
+ GError **error);
+GLIB_AVAILABLE_IN_ALL
+const gchar *g_dir_read_name_utf8 (GDir *dir);
+#endif /* G_OS_WIN32 */
+
G_END_DECLS
#endif /* __G_DIR_H__ */