Make sure compiled resources only have / as dirsep

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

diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h
index 3c162c7..4e37e07 100644 (file)
--- a/gio/gfileinputstream.h
+++ b/gio/gfileinputstream.h
@@ -13,20 +13,18 @@
  * 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>
  */
 
+#ifndef __G_FILE_INPUT_STREAM_H__
+#define __G_FILE_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_INPUT_STREAM_H__
-#define __G_FILE_INPUT_STREAM_H__
-
 #include <gio/ginputstream.h>
 
 G_BEGIN_DECLS
@@ -79,7 +77,7 @@ struct _GFileInputStreamClass
                                      GAsyncReadyCallback   callback,
                                      gpointer              user_data);
   GFileInfo * (* query_info_finish) (GFileInputStream     *stream,
-                                     GAsyncResult         *res,
+                                     GAsyncResult         *result,
                                      GError              **error);
 
   /*< private >*/
@@ -91,18 +89,22 @@ struct _GFileInputStreamClass
   void (*_g_reserved5) (void);
 };
 
+GLIB_AVAILABLE_IN_ALL
 GType      g_file_input_stream_get_type          (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
                                                  const char           *attributes,
                                                  GCancellable         *cancellable,
                                                  GError              **error);
+GLIB_AVAILABLE_IN_ALL
 void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
                                                  const char           *attributes,
                                                  int                   io_priority,
                                                  GCancellable         *cancellable,
                                                  GAsyncReadyCallback   callback,
                                                  gpointer              user_data);
+GLIB_AVAILABLE_IN_ALL
 GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream     *stream,
                                                  GAsyncResult         *result,
                                                  GError              **error);