projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gsocket: Set SO_NOSIGPIPE on sockets on Darwin
[platform/upstream/glib.git]
/
gio
/
gresource.h
diff --git
a/gio/gresource.h
b/gio/gresource.h
index
15bfc8a
..
9c79db9
100644
(file)
--- a/
gio/gresource.h
+++ b/
gio/gresource.h
@@
-13,20
+13,18
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
+#ifndef __G_RESOURCE_H__
+#define __G_RESOURCE_H__
+
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
-#ifndef __G_RESOURCE_H__
-#define __G_RESOURCE_H__
-
#include <gio/giotypes.h>
G_BEGIN_DECLS
#include <gio/giotypes.h>
G_BEGIN_DECLS
@@
-47,6
+45,7
@@
G_BEGIN_DECLS
* error domains.
*/
#define G_RESOURCE_ERROR (g_resource_error_quark ())
* error domains.
*/
#define G_RESOURCE_ERROR (g_resource_error_quark ())
+GLIB_AVAILABLE_IN_2_32
GQuark g_resource_error_quark (void);
typedef struct _GStaticResource GStaticResource;
GQuark g_resource_error_quark (void);
typedef struct _GStaticResource GStaticResource;
@@
-64,6
+63,7
@@
GType g_resource_get_type (void) G_GNUC_CONST;
GLIB_AVAILABLE_IN_2_32
GResource * g_resource_new_from_data (GBytes *data,
GError **error);
GLIB_AVAILABLE_IN_2_32
GResource * g_resource_new_from_data (GBytes *data,
GError **error);
+GLIB_AVAILABLE_IN_2_32
GResource * g_resource_ref (GResource *resource);
GLIB_AVAILABLE_IN_2_32
void g_resource_unref (GResource *resource);
GResource * g_resource_ref (GResource *resource);
GLIB_AVAILABLE_IN_2_32
void g_resource_unref (GResource *resource);