callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include glib-object.h, Add G_BEGIN_DECLS/END_DECLS to

Browse Source 
Wed Jan  9 11:29:44 2002  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am (s-enum-types-h): Include glib-object.h,
	Add G_BEGIN_DECLS/END_DECLS to gdk-pixbuf-enum-types.h. (#68325,
	Mikael Hermansson)

	* *.h: G_BEGIN_DECLS cleanups.
This commit is contained in:
Owen Taylor 2002-01-09 16:36:20 +00:00 committed by Owen Taylor
parent 89cfdce4e6
commit add14c9ef4
6 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,11 @@
Wed Jan 9 11:29:44 2002 Owen Taylor <otaylor@redhat.com>
* Makefile.am (s-enum-types-h): Include glib-object.h,
Add G_BEGIN_DECLS/END_DECLS to gdk-pixbuf-enum-types.h. (#68325,
Mikael Hermansson)
* *.h: G_BEGIN_DECLS cleanups.
Tue Jan 8 10:58:04 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 10:58:04 2002 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf-util.c (gdk_pixbuf_saturate_and_pixelate): * gdk-pixbuf-util.c (gdk_pixbuf_saturate_and_pixelate):

4
gdk-pixbuf/Makefile.am
View File

@ -290,10 +290,10 @@ $(srcdir)/gdk-pixbuf-enum-types.h: s-enum-types-h
s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
( cd $(srcdir) && glib-mkenums \ ( cd $(srcdir) && glib-mkenums \
--fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n" \ --fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \ --ftail "G_END_DECLS\n\n#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \
$(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \ $(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \
&& (cmp -s tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h ) \ && (cmp -s tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h ) \
&& rm -f tmp-gdk-pixbuf-enum-types.h \ && rm -f tmp-gdk-pixbuf-enum-types.h \

8
gdk-pixbuf/gdk-pixbuf-io.h
View File

@ -33,9 +33,7 @@
#include "gdk-pixbuf.h" #include "gdk-pixbuf.h"
#include "gdk-pixbuf-i18n.h" #include "gdk-pixbuf-i18n.h"
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif
@ -94,8 +92,6 @@ gboolean _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
#ifdef __cplusplus G_END_DECLS
}
#endif
#endif #endif

8
gdk-pixbuf/gdk-pixbuf-loader.h
View File

@ -26,9 +26,7 @@
#ifndef GDK_PIXBUF_LOADER_H #ifndef GDK_PIXBUF_LOADER_H
#define GDK_PIXBUF_LOADER_H #define GDK_PIXBUF_LOADER_H
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif
#define GDK_TYPE_PIXBUF_LOADER (gdk_pixbuf_loader_get_type ()) #define GDK_TYPE_PIXBUF_LOADER (gdk_pixbuf_loader_get_type ())
#define GDK_PIXBUF_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader)) #define GDK_PIXBUF_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
@ -79,8 +77,6 @@ gboolean gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
GError **error); GError **error);
#ifdef __cplusplus G_END_DECLS
}
#endif
#endif #endif

10
gdk-pixbuf/gdk-pixbuf.h
View File

@ -30,9 +30,7 @@
#include <gdk-pixbuf/gdk-pixbuf-features.h> #include <gdk-pixbuf/gdk-pixbuf-features.h>
#include <glib-object.h> #include <glib-object.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif
@ -291,13 +289,11 @@ G_CONST_RETURN gchar * gdk_pixbuf_get_option (GdkPixbuf *pixbuf,
G_END_DECLS
#include <gdk-pixbuf/gdk-pixbuf-loader.h> #include <gdk-pixbuf/gdk-pixbuf-loader.h>
#include <gdk-pixbuf/gdk-pixbuf-enum-types.h> #include <gdk-pixbuf/gdk-pixbuf-enum-types.h>
#ifdef __cplusplus
}
#endif
#endif #endif

9
gdk-pixbuf/gdk-pixdata.h
View File

@ -21,9 +21,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/** /**
* GDK_PIXBUF_MAGIC_NUMBER: * GDK_PIXBUF_MAGIC_NUMBER:
@ -167,9 +165,6 @@ GString* gdk_pixdata_to_csource (GdkPixdata *pixdata,
GdkPixdataDumpType dump_type); GdkPixdataDumpType dump_type);
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GDK_PIXDATA_H__ */ #endif /* __GDK_PIXDATA_H__ */