GNOME.org
 

[libgsf] Types: make sure gsf_init_dynamic does its jobs.

commit 660e998018f7c6a2c0cd6b6c0f2b97ca1e5bf5b0
Author: Morten Welinder <terra gnome org>
Date:   Thu Aug 2 07:49:31 2018 -0400

    Types: make sure gsf_init_dynamic does its jobs.
    
    This drops the G_GNUC_CONST annotations on get_type functions in order
    to ensure that certain versions of gcc don't aggressively remove calls.

 ChangeLog                  | 6 ++++++
 NEWS                       | 1 +
 gsf/gsf-blob.h             | 2 +-
 gsf/gsf-clip-data.h        | 2 +-
 gsf/gsf-doc-meta-data.h    | 2 +-
 gsf/gsf-docprop-vector.h   | 2 +-
 gsf/gsf-infile-msole.h     | 2 +-
 gsf/gsf-infile-msvba.h     | 2 +-
 gsf/gsf-infile-stdio.h     | 2 +-
 gsf/gsf-infile-tar.h       | 2 +-
 gsf/gsf-infile-zip.h       | 2 +-
 gsf/gsf-infile.h           | 2 +-
 gsf/gsf-input-gzip.h       | 2 +-
 gsf/gsf-input-http.h       | 2 +-
 gsf/gsf-input-memory.h     | 2 +-
 gsf/gsf-input-proxy.h      | 2 +-
 gsf/gsf-input-stdio.h      | 2 +-
 gsf/gsf-input-textline.h   | 2 +-
 gsf/gsf-input.h            | 2 +-
 gsf/gsf-libxml.h           | 2 +-
 gsf/gsf-open-pkg-utils.h   | 2 +-
 gsf/gsf-opendoc-utils.h    | 2 +-
 gsf/gsf-outfile-msole.h    | 2 +-
 gsf/gsf-outfile-stdio.h    | 2 +-
 gsf/gsf-outfile-zip.h      | 2 +-
 gsf/gsf-outfile.h          | 2 +-
 gsf/gsf-output-bzip.h      | 2 +-
 gsf/gsf-output-csv.h       | 4 ++--
 gsf/gsf-output-gzip.h      | 2 +-
 gsf/gsf-output-iconv.h     | 2 +-
 gsf/gsf-output-iochannel.h | 2 +-
 gsf/gsf-output-memory.h    | 2 +-
 gsf/gsf-output-stdio.h     | 2 +-
 gsf/gsf-output.h           | 2 +-
 gsf/gsf-shared-memory.h    | 2 +-
 gsf/gsf-structured-blob.h  | 2 +-
 gsf/gsf-timestamp.h        | 2 +-
 37 files changed, 43 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e36e6b2..be56bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-02  Morten Welinder  <terra gnome org>
+
+       * gsf/*.h: Drop G_GNUC_CONST annotations on get_type functions.
+       It causes gsf_init_dynamic to be mostly a no-op with some gcc
+       versions.
+
 2018-04-29  Morten Welinder  <terra gnome org>
 
        * gsf/gsf-msole-utils.c (msole_metadata_write_string): Write the
diff --git a/NEWS b/NEWS
index 24aeb1e..7f5fa97 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ libgsf 1.14.44
 
 Morten:
        * Fix msole metadata writing for non-ascii.  [#795612]
+       * Fix problem with threaded code.  [#10]
 
 --------------------------------------------------------------------------
 libgsf 1.14.43
diff --git a/gsf/gsf-blob.h b/gsf/gsf-blob.h
index 90664db..f6e4fa4 100644
--- a/gsf/gsf-blob.h
+++ b/gsf/gsf-blob.h
@@ -23,7 +23,7 @@ struct _GsfBlob {
        GsfBlobPrivate *priv;
 };
 
-GType gsf_blob_get_type (void) G_GNUC_CONST;
+GType gsf_blob_get_type (void);
 /* void  gsf_blob_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfBlob *gsf_blob_new (gsize size,
diff --git a/gsf/gsf-clip-data.h b/gsf/gsf-clip-data.h
index 42528d3..5a4edca 100644
--- a/gsf/gsf-clip-data.h
+++ b/gsf/gsf-clip-data.h
@@ -49,7 +49,7 @@ struct _GsfClipData {
        GsfClipDataPrivate *priv;
 };
 
-GType gsf_clip_data_get_type      (void) G_GNUC_CONST;
+GType gsf_clip_data_get_type      (void);
 /* void  gsf_clip_data_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfClipData *gsf_clip_data_new (GsfClipFormat format,
diff --git a/gsf/gsf-doc-meta-data.h b/gsf/gsf-doc-meta-data.h
index d6229f5..60f1592 100644
--- a/gsf/gsf-doc-meta-data.h
+++ b/gsf/gsf-doc-meta-data.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GSF_DOC_META_DATA(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_DOC_META_DATA_TYPE, GsfDocMetaData))
 #define IS_GSF_DOC_META_DATA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_DOC_META_DATA_TYPE))
 
-GType gsf_doc_meta_data_get_type      (void) G_GNUC_CONST;
+GType gsf_doc_meta_data_get_type      (void);
 /* void  gsf_doc_meta_data_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfDocMetaData *gsf_doc_meta_data_new    (void);
diff --git a/gsf/gsf-docprop-vector.h b/gsf/gsf-docprop-vector.h
index d87ab0a..027b32e 100644
--- a/gsf/gsf-docprop-vector.h
+++ b/gsf/gsf-docprop-vector.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define IS_GSF_DOCPROP_VECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GSF_DOCPROP_VECTOR_TYPE))
 
 typedef struct _GsfDocPropVector      GsfDocPropVector;
-GType gsf_docprop_vector_get_type      (void) G_GNUC_CONST;
+GType gsf_docprop_vector_get_type      (void);
 /* void  gsf_docprop_vector_register_type      (GTypeModule *module); glib dynamic types are not thread safe 
*/
 
 GsfDocPropVector *gsf_docprop_vector_new       (void);
diff --git a/gsf/gsf-infile-msole.h b/gsf/gsf-infile-msole.h
index c82a32b..f2aaa8f 100644
--- a/gsf/gsf-infile-msole.h
+++ b/gsf/gsf-infile-msole.h
@@ -33,7 +33,7 @@ typedef struct _GsfInfileMSOle GsfInfileMSOle;
 #define GSF_INFILE_MSOLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_INFILE_MSOLE_TYPE, 
GsfInfileMSOle))
 #define GSF_IS_INFILE_MSOLE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_INFILE_MSOLE_TYPE))
 
-GType gsf_infile_msole_get_type             (void) G_GNUC_CONST;
+GType gsf_infile_msole_get_type             (void);
 /* void  gsf_infile_msole_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInfile *gsf_infile_msole_new                 (GsfInput *source, GError **err);
diff --git a/gsf/gsf-infile-msvba.h b/gsf/gsf-infile-msvba.h
index 7144aaa..39087e1 100644
--- a/gsf/gsf-infile-msvba.h
+++ b/gsf/gsf-infile-msvba.h
@@ -33,7 +33,7 @@ typedef struct _GsfInfileMSVBA GsfInfileMSVBA;
 #define GSF_INFILE_MSVBA(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_INFILE_MSVBA_TYPE, 
GsfInfileMSVBA))
 #define GSF_IS_INFILE_MSVBA(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_INFILE_MSVBA_TYPE))
 
-GType gsf_infile_msvba_get_type      (void) G_GNUC_CONST;
+GType gsf_infile_msvba_get_type      (void);
 /* void  gsf_infile_msvba_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInfile  *gsf_infile_msvba_new (GsfInfile *source, GError **err);
diff --git a/gsf/gsf-infile-stdio.h b/gsf/gsf-infile-stdio.h
index bc7ecc6..2912dba 100644
--- a/gsf/gsf-infile-stdio.h
+++ b/gsf/gsf-infile-stdio.h
@@ -33,7 +33,7 @@ typedef struct _GsfInfileStdio GsfInfileStdio;
 #define GSF_INFILE_STDIO(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_INFILE_STDIO_TYPE, 
GsfInfileStdio))
 #define GSF_IS_INFILE_STDIO(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_INFILE_STDIO_TYPE))
 
-GType gsf_infile_stdio_get_type      (void) G_GNUC_CONST;
+GType gsf_infile_stdio_get_type      (void);
 /* void  gsf_infile_stdio_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInfile *gsf_infile_stdio_new      (char const *root, GError **err);
diff --git a/gsf/gsf-infile-tar.h b/gsf/gsf-infile-tar.h
index 0c09dfa..bc4f4f6 100644
--- a/gsf/gsf-infile-tar.h
+++ b/gsf/gsf-infile-tar.h
@@ -32,7 +32,7 @@ typedef struct _GsfInfileTar GsfInfileTar;
 #define GSF_INFILE_TAR(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_INFILE_TAR_TYPE, GsfInfileTar))
 #define GSF_IS_INFILE_TAR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_INFILE_TAR_TYPE))
 
-GType gsf_infile_tar_get_type      (void) G_GNUC_CONST;
+GType gsf_infile_tar_get_type      (void);
 GsfInfile *gsf_infile_tar_new      (GsfInput *source, GError **err);
 
 G_END_DECLS
diff --git a/gsf/gsf-infile-zip.h b/gsf/gsf-infile-zip.h
index ca8c0a9..b71c4aa 100644
--- a/gsf/gsf-infile-zip.h
+++ b/gsf/gsf-infile-zip.h
@@ -33,7 +33,7 @@ typedef struct _GsfInfileZip GsfInfileZip;
 #define GSF_INFILE_ZIP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_INFILE_ZIP_TYPE, GsfInfileZip))
 #define GSF_IS_INFILE_ZIP(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_INFILE_ZIP_TYPE))
 
-GType gsf_infile_zip_get_type      (void) G_GNUC_CONST;
+GType gsf_infile_zip_get_type      (void);
 /* void  gsf_infile_zip_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInfile *gsf_infile_zip_new      (GsfInput *source, GError **err);
diff --git a/gsf/gsf-infile.h b/gsf/gsf-infile.h
index a6d0d15..12d84bc 100644
--- a/gsf/gsf-infile.h
+++ b/gsf/gsf-infile.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 #define GSF_INFILE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_INFILE_TYPE, GsfInfile))
 #define GSF_IS_INFILE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_INFILE_TYPE))
 
-GType gsf_infile_get_type      (void) G_GNUC_CONST;
+GType gsf_infile_get_type      (void);
 /* void  gsf_infile_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 int        gsf_infile_num_children    (GsfInfile *infile);
diff --git a/gsf/gsf-input-gzip.h b/gsf/gsf-input-gzip.h
index c60690d..e9ba3ac 100644
--- a/gsf/gsf-input-gzip.h
+++ b/gsf/gsf-input-gzip.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfInputGZip GsfInputGZip;
 
-GType gsf_input_gzip_get_type      (void) G_GNUC_CONST;
+GType gsf_input_gzip_get_type      (void);
 /* void  gsf_input_gzip_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInput *gsf_input_gzip_new     (GsfInput *source, GError **err);
diff --git a/gsf/gsf-input-http.h b/gsf/gsf-input-http.h
index 367b35a..0f58308 100644
--- a/gsf/gsf-input-http.h
+++ b/gsf/gsf-input-http.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfInputHTTP GsfInputHTTP;
 
-GType gsf_input_http_get_type (void) G_GNUC_CONST;
+GType gsf_input_http_get_type (void);
 /* void  gsf_input_http_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInput *gsf_input_http_new (gchar const *url, GError **error);
diff --git a/gsf/gsf-input-memory.h b/gsf/gsf-input-memory.h
index 52a3ed4..be94b1a 100644
--- a/gsf/gsf-input-memory.h
+++ b/gsf/gsf-input-memory.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfInputMemory GsfInputMemory;
 
-GType gsf_input_memory_get_type      (void) G_GNUC_CONST;
+GType gsf_input_memory_get_type      (void);
 /* void  gsf_input_memory_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInput *gsf_input_memory_new       (guint8 const *buf, gsf_off_t length,
diff --git a/gsf/gsf-input-proxy.h b/gsf/gsf-input-proxy.h
index b4df482..9c27467 100644
--- a/gsf/gsf-input-proxy.h
+++ b/gsf/gsf-input-proxy.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfInputProxy GsfInputProxy;
 
-GType gsf_input_proxy_get_type      (void) G_GNUC_CONST;
+GType gsf_input_proxy_get_type      (void);
 /* void  gsf_input_proxy_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInput *gsf_input_proxy_new      (GsfInput *source);
diff --git a/gsf/gsf-input-stdio.h b/gsf/gsf-input-stdio.h
index a9797f2..b3c75f9 100644
--- a/gsf/gsf-input-stdio.h
+++ b/gsf/gsf-input-stdio.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfInputStdio GsfInputStdio;
 
-GType gsf_input_stdio_get_type      (void) G_GNUC_CONST;
+GType gsf_input_stdio_get_type      (void);
 /* void  gsf_input_stdio_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfInput *gsf_input_stdio_new      (char const *filename, GError **err);
diff --git a/gsf/gsf-input-textline.h b/gsf/gsf-input-textline.h
index 4baaaa0..2d30fb4 100644
--- a/gsf/gsf-input-textline.h
+++ b/gsf/gsf-input-textline.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfInputTextline GsfInputTextline;
 
-GType gsf_input_textline_get_type      (void) G_GNUC_CONST;
+GType gsf_input_textline_get_type      (void);
 /* void  gsf_input_textline_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 
diff --git a/gsf/gsf-input.h b/gsf/gsf-input.h
index c388454..a0ef79b 100644
--- a/gsf/gsf-input.h
+++ b/gsf/gsf-input.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GSF_INPUT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_INPUT_TYPE, GsfInput))
 #define GSF_IS_INPUT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_INPUT_TYPE))
 
-GType gsf_input_get_type      (void) G_GNUC_CONST;
+GType gsf_input_get_type      (void);
 /* void  gsf_input_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 char const   *gsf_input_name     (GsfInput *input);
diff --git a/gsf/gsf-libxml.h b/gsf/gsf-libxml.h
index 709c359..dbaabb6 100644
--- a/gsf/gsf-libxml.h
+++ b/gsf/gsf-libxml.h
@@ -175,7 +175,7 @@ struct _GsfXMLOut {
 #define GSF_XML_OUT(o)         (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_XML_OUT_TYPE, GsfXMLOut))
 #define GSF_IS_XML_OUT(o)      (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_XML_OUT_TYPE))
 
-GType gsf_xml_out_get_type      (void) G_GNUC_CONST;
+GType gsf_xml_out_get_type      (void);
 /* void  gsf_xml_out_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfXMLOut *gsf_xml_out_new (GsfOutput *output);
diff --git a/gsf/gsf-open-pkg-utils.h b/gsf/gsf-open-pkg-utils.h
index 45d80e7..801b09c 100644
--- a/gsf/gsf-open-pkg-utils.h
+++ b/gsf/gsf-open-pkg-utils.h
@@ -67,7 +67,7 @@ typedef struct _GsfOutfileOpenPkg GsfOutfileOpenPkg;
 #define GSF_OUTFILE_OPEN_PKG(o)                (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_OUTFILE_OPEN_PKG_TYPE, 
GsfOutfileOpenPkg))
 #define GSF_IS_OUTFILE_OPEN_PKG(o)     (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_OUTFILE_OPEN_PKG_TYPE))
 
-GType      gsf_outfile_open_pkg_get_type       (void) G_GNUC_CONST;
+GType      gsf_outfile_open_pkg_get_type       (void);
 /* void            gsf_outfile_open_pkg_register_type  (GTypeModule *module); glib dynamic types are not 
thread safe */
 
 GsfOutfile *gsf_outfile_open_pkg_new             (GsfOutfile *sink);
diff --git a/gsf/gsf-opendoc-utils.h b/gsf/gsf-opendoc-utils.h
index ebc21c7..7bd4551 100644
--- a/gsf/gsf-opendoc-utils.h
+++ b/gsf/gsf-opendoc-utils.h
@@ -53,7 +53,7 @@ struct _GsfODFOut {
 #define GSF_ODF_OUT(o)         (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_ODF_OUT_TYPE, GsfODFOut))
 #define GSF_IS_ODF_OUT(o)      (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_ODF_OUT_TYPE))
 
-GType gsf_odf_out_get_type      (void) G_GNUC_CONST;
+GType gsf_odf_out_get_type      (void);
 
 int gsf_odf_out_get_version     (GsfODFOut *oout);
 char *gsf_odf_out_get_version_string (GsfODFOut *oout);
diff --git a/gsf/gsf-outfile-msole.h b/gsf/gsf-outfile-msole.h
index f9c9b53..d60e497 100644
--- a/gsf/gsf-outfile-msole.h
+++ b/gsf/gsf-outfile-msole.h
@@ -33,7 +33,7 @@ typedef struct _GsfOutfileMSOle GsfOutfileMSOle;
 #define GSF_OUTFILE_MSOLE(o)   (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_OUTFILE_MSOLE_TYPE, GsfOutfileMSOle))
 #define GSF_IS_OUTFILE_MSOLE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_OUTFILE_MSOLE_TYPE))
 
-GType gsf_outfile_msole_get_type      (void) G_GNUC_CONST;
+GType gsf_outfile_msole_get_type      (void);
 /* void  gsf_outfile_msole_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutfile *gsf_outfile_msole_new         (GsfOutput *sink);
diff --git a/gsf/gsf-outfile-stdio.h b/gsf/gsf-outfile-stdio.h
index ef39fe6..5c87d33 100644
--- a/gsf/gsf-outfile-stdio.h
+++ b/gsf/gsf-outfile-stdio.h
@@ -33,7 +33,7 @@ typedef struct _GsfOutfileStdio GsfOutfileStdio;
 #define GSF_OUTFILE_STDIO(o)   (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_OUTFILE_STDIO_TYPE, GsfOutfileStdio))
 #define GSF_IS_OUTFILE_STDIO(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_OUTFILE_STDIO_TYPE))
 
-GType gsf_outfile_stdio_get_type      (void) G_GNUC_CONST;
+GType gsf_outfile_stdio_get_type      (void);
 /* void  gsf_outfile_stdio_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutfile *gsf_outfile_stdio_new       (char const *root, GError **err);
diff --git a/gsf/gsf-outfile-zip.h b/gsf/gsf-outfile-zip.h
index 43efc2f..eac9117 100644
--- a/gsf/gsf-outfile-zip.h
+++ b/gsf/gsf-outfile-zip.h
@@ -47,7 +47,7 @@ typedef struct _GsfOutfileZip GsfOutfileZip;
 #define GSF_OUTFILE_ZIP(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_OUTFILE_ZIP_TYPE, GsfOutfileZip))
 #define GSF_IS_OUTFILE_ZIP(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_OUTFILE_ZIP_TYPE))
 
-GType gsf_outfile_zip_get_type     (void) G_GNUC_CONST;
+GType gsf_outfile_zip_get_type     (void);
 /* void  gsf_outfile_zip_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutfile *gsf_outfile_zip_new                (GsfOutput *sink, GError **err);
diff --git a/gsf/gsf-outfile.h b/gsf/gsf-outfile.h
index 1c9c7c9..8ecf098 100644
--- a/gsf/gsf-outfile.h
+++ b/gsf/gsf-outfile.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 #define GSF_OUTFILE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_OUTFILE_TYPE, GsfOutfile))
 #define GSF_IS_OUTFILE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_OUTFILE_TYPE))
 
-GType gsf_outfile_get_type      (void) G_GNUC_CONST;
+GType gsf_outfile_get_type      (void);
 /* void  gsf_outfile_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutput *gsf_outfile_new_child      (GsfOutfile *outfile,
diff --git a/gsf/gsf-output-bzip.h b/gsf/gsf-output-bzip.h
index 3507e2c..e650cee 100644
--- a/gsf/gsf-output-bzip.h
+++ b/gsf/gsf-output-bzip.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfOutputBzip GsfOutputBzip;
 
-GType gsf_output_bzip_get_type      (void) G_GNUC_CONST;
+GType gsf_output_bzip_get_type      (void);
 /* void  gsf_output_bzip_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutput *gsf_output_bzip_new     (GsfOutput *sink, GError **err);
diff --git a/gsf/gsf-output-csv.h b/gsf/gsf-output-csv.h
index 14f94e3..27d2f30 100644
--- a/gsf/gsf-output-csv.h
+++ b/gsf/gsf-output-csv.h
@@ -40,7 +40,7 @@ typedef enum {
        GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS
 } GsfOutputCsvQuotingMode;
 
-GType gsf_output_csv_quoting_mode_get_type      (void) G_GNUC_CONST;
+GType gsf_output_csv_quoting_mode_get_type      (void);
 /* void  gsf_output_csv_quoting_mode_register_type (GTypeModule *module); glib dynamic types are not thread 
safe */
 
 #define GSF_OUTPUT_CSV_QUOTING_MODE_TYPE (gsf_output_csv_quoting_mode_get_type ())
@@ -67,7 +67,7 @@ typedef struct {
 #define GSF_OUTPUT_CSV_TYPE        (gsf_output_csv_get_type ())
 #define GSF_OUTPUT_CSV(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_OUTPUT_CSV_TYPE, GsfOutputCsv))
 #define GSF_IS_OUTPUT_CSV(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_OUTPUT_CSV_TYPE))
-GType gsf_output_csv_get_type      (void) G_GNUC_CONST;
+GType gsf_output_csv_get_type      (void);
 /* void  gsf_output_csv_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 gboolean gsf_output_csv_write_field (GsfOutputCsv *csv,
diff --git a/gsf/gsf-output-gzip.h b/gsf/gsf-output-gzip.h
index 081210d..a7eb72d 100644
--- a/gsf/gsf-output-gzip.h
+++ b/gsf/gsf-output-gzip.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfOutputGZip GsfOutputGZip;
 
-GType gsf_output_gzip_get_type      (void) G_GNUC_CONST;
+GType gsf_output_gzip_get_type      (void);
 /* void  gsf_output_gzip_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutput *gsf_output_gzip_new     (GsfOutput *sink, GError **err);
diff --git a/gsf/gsf-output-iconv.h b/gsf/gsf-output-iconv.h
index 6d2b0e7..21f8773 100644
--- a/gsf/gsf-output-iconv.h
+++ b/gsf/gsf-output-iconv.h
@@ -37,7 +37,7 @@ typedef struct {
 
 typedef struct _GsfOutputIconv GsfOutputIconv;
 
-GType gsf_output_iconv_get_type      (void) G_GNUC_CONST;
+GType gsf_output_iconv_get_type      (void);
 /* void  gsf_output_iconv_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutput *gsf_output_iconv_new      (GsfOutput *sink, char const *dst, char const *src);
diff --git a/gsf/gsf-output-iochannel.h b/gsf/gsf-output-iochannel.h
index dd76ac3..2538fe2 100644
--- a/gsf/gsf-output-iochannel.h
+++ b/gsf/gsf-output-iochannel.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfOutputIOChannel GsfOutputIOChannel;
 
-GType gsf_output_iochannel_get_type      (void) G_GNUC_CONST;
+GType gsf_output_iochannel_get_type      (void);
 /* void  gsf_output_iochannel_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutput *gsf_output_iochannel_new     (GIOChannel * channel);
diff --git a/gsf/gsf-output-memory.h b/gsf/gsf-output-memory.h
index 413c4c6..8b3875a 100644
--- a/gsf/gsf-output-memory.h
+++ b/gsf/gsf-output-memory.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfOutputMemory GsfOutputMemory;
 
-GType gsf_output_memory_get_type      (void) G_GNUC_CONST;
+GType gsf_output_memory_get_type      (void);
 /* void  gsf_output_memory_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutput *gsf_output_memory_new      (void);
diff --git a/gsf/gsf-output-stdio.h b/gsf/gsf-output-stdio.h
index acac922..36b2d90 100644
--- a/gsf/gsf-output-stdio.h
+++ b/gsf/gsf-output-stdio.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 
 typedef struct _GsfOutputStdio GsfOutputStdio;
 
-GType gsf_output_stdio_get_type             (void) G_GNUC_CONST;
+GType gsf_output_stdio_get_type             (void);
 /* void  gsf_output_stdio_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfOutput *gsf_output_stdio_new        (char const *filename, GError **err);
diff --git a/gsf/gsf-output.h b/gsf/gsf-output.h
index 5ea63e1..f47bcc0 100644
--- a/gsf/gsf-output.h
+++ b/gsf/gsf-output.h
@@ -60,7 +60,7 @@ struct _GsfOutput {
 #define GSF_OUTPUT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GSF_OUTPUT_TYPE, GsfOutput))
 #define GSF_IS_OUTPUT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSF_OUTPUT_TYPE))
 
-GType gsf_output_get_type      (void) G_GNUC_CONST;
+GType gsf_output_get_type      (void);
 /* void  gsf_output_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 char const   *gsf_output_name     (GsfOutput const *output);
diff --git a/gsf/gsf-shared-memory.h b/gsf/gsf-shared-memory.h
index a486716..15c06ae 100644
--- a/gsf/gsf-shared-memory.h
+++ b/gsf/gsf-shared-memory.h
@@ -40,7 +40,7 @@ struct _GsfSharedMemory {
        gboolean needs_unmap;
 };
 
-GType gsf_shared_memory_get_type      (void) G_GNUC_CONST;
+GType gsf_shared_memory_get_type      (void);
 /* void  gsf_shared_memory_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfSharedMemory *gsf_shared_memory_new (void *buf, gsf_off_t size, gboolean needs_free);
diff --git a/gsf/gsf-structured-blob.h b/gsf/gsf-structured-blob.h
index 1fb85fe..aef5237 100644
--- a/gsf/gsf-structured-blob.h
+++ b/gsf/gsf-structured-blob.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 typedef struct _GsfStructuredBlob      GsfStructuredBlob;
 
 /* inherits from GsfInfile */
-GType gsf_structured_blob_get_type      (void) G_GNUC_CONST;
+GType gsf_structured_blob_get_type      (void);
 /* void  gsf_structured_blob_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfStructuredBlob *gsf_structured_blob_read  (GsfInput *input);
diff --git a/gsf/gsf-timestamp.h b/gsf/gsf-timestamp.h
index 2ec2210..e453426 100644
--- a/gsf/gsf-timestamp.h
+++ b/gsf/gsf-timestamp.h
@@ -38,7 +38,7 @@ struct _GsfTimestamp {
        guint32   timet;
 };
 
-GType gsf_timestamp_get_type      (void) G_GNUC_CONST;
+GType gsf_timestamp_get_type      (void);
 /* void  gsf_timestamp_register_type (GTypeModule *module); glib dynamic types are not thread safe */
 
 GsfTimestamp *gsf_timestamp_new        (void);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]