Ticket #34242: patch-glib-2.32.diff

File patch-glib-2.32.diff, 12.8 KB (added by ryandesign (Ryan Carsten Schmidt), 13 years ago)

  • libgda/gda-command.c

    old new  
    2020 * Boston, MA 02111-1307, USA.
    2121 */
    2222
    23 #include <glib/gmem.h>
    24 #include <glib/gmessages.h>
    25 #include <glib/gstrfuncs.h>
     23#include <glib.h>
    2624#include <libgda/gda-command.h>
    2725
    2826GType

  • libgda/gda-command.h

    old new  
    2323#if !defined(__gda_command_h__)
    2424#  define __gda_command_h__
    2525
    26 #include <glib/gmacros.h>
    27 #include <glib/gtypes.h>
     26#include <glib.h>
    2827#include <libgda/gda-transaction.h>
    2928
    3029G_BEGIN_DECLS

  • libgda/gda-config.h

    old new  
    2323#if !defined(__gda_config_h__)
    2424#  define __gda_config_h__
    2525
    26 #include <glib/gmacros.h>
     26#include <glib.h>
    2727#include <libgda/gda-data-model.h>
    2828#include <libgda/gda-parameter.h>
    2929

  • libgda/gda-data-model-array.c

    old new  
    2020 * Boston, MA 02111-1307, USA.
    2121 */
    2222
    23 #include <glib/garray.h>
     23#include <glib.h>
    2424#include <libgda/gda-data-model-array.h>
    2525
    2626#define PARENT_TYPE GDA_TYPE_DATA_MODEL

  • libgda/gda-data-model-hash.c

    old new  
    2222 * Boston, MA 02111-1307, USA.
    2323 */
    2424
    25 #include <glib/ghash.h>
     25#include <glib.h>
    2626#include <libgda/gda-data-model-hash.h>
    2727
    2828#define PARENT_TYPE GDA_TYPE_DATA_MODEL

  • libgda/gda-field.c

    old new  
    2121 * Boston, MA 02111-1307, USA.
    2222 */
    2323
    24 #include <glib/gmessages.h>
    25 #include <glib/gstrfuncs.h>
     24#include <glib.h>
    2625#include <libgda/gda-field.h>
    2726#include <string.h>
    2827

  • libgda/gda-field.h

    old new  
    2525#  define __gda_field_h__
    2626
    2727#include <libgda/gda-value.h>
    28 #include <glib/gmacros.h>
     28#include <glib.h>
    2929
    3030G_BEGIN_DECLS
    3131

  • libgda/gda-init.c

    old new  
    1717 * Boston, MA 02111-1307, USA.
    1818 */
    1919
    20 #include <glib/gmain.h>
     20#include <glib.h>
    2121#include <gmodule.h>
    2222#include <libgda/libgda.h>
    2323#include <libgda/gda-intl.h>

  • libgda/gda-log.c

    old new  
    2424#endif
    2525#include <time.h>
    2626#include <glib.h>
    27 #include <glib/gmem.h>
    28 #include <glib/gmessages.h>
    29 #include <glib/gstrfuncs.h>
    30 #include <glib/gutils.h>
    3127#include <libgda/gda-intl.h>
    3228#include <libgda/gda-log.h>
    3329

  • libgda/gda-log.h

    old new  
    2020#if !defined(__gda_log_h__)
    2121#  define __gda_log_h__
    2222
    23 #include <glib/gmacros.h>
    24 #include <glib/gtypes.h>
     23#include <glib.h>
    2524#include <time.h>
    2625
    2726G_BEGIN_DECLS

  • libgda/gda-parameter.c

    old new  
    2020 * Boston, MA 02111-1307, USA.
    2121 */
    2222
    23 #include <glib/ghash.h>
    24 #include <glib/gmem.h>
    25 #include <glib/gmessages.h>
    26 #include <glib/gstrfuncs.h>
     23#include <glib.h>
    2724#include <libgda/gda-parameter.h>
    2825
    2926struct _GdaParameterList {

  • libgda/gda-parameter.h

    old new  
    2323#if !defined(__gda_parameter_h__)
    2424#  define __gda_parameter_h__
    2525
    26 #include <glib/gmacros.h>
     26#include <glib.h>
    2727#include <libgda/gda-value.h>
    2828
    2929G_BEGIN_DECLS

  • libgda/gda-quark-list.c

    old new  
    2121 */
    2222
    2323#include <libgda/gda-quark-list.h>
    24 #include <glib/ghash.h>
    25 #include <glib/gmem.h>
    26 #include <glib/gmessages.h>
    27 #include <glib/gstrfuncs.h>
     24#include <glib.h>
    2825
    2926struct _GdaQuarkList {
    3027        GHashTable *hash_table;

  • libgda/gda-quark-list.h

    old new  
    2323#if !defined(__gda_quark_list_h__)
    2424#  define __gda_quark_list_h__
    2525
    26 #include <glib/gmacros.h>
    27 #include <glib/gtypes.h>
     26#include <glib.h>
    2827#include <glib-object.h>
    2928
    3029G_BEGIN_DECLS

  • libgda/gda-row.c

    old new  
    2020 * Boston, MA 02111-1307, USA.
    2121 */
    2222
    23 #include <glib/gmessages.h>
    24 #include <glib/gstrfuncs.h>
     23#include <glib.h>
    2524#include <libgda/gda-row.h>
    2625
    2726struct _GdaRow {

  • libgda/gda-select.c

    old new  
    2020 * Boston, MA 02111-1307, USA.
    2121 */
    2222
    23 #include <glib/gdataset.h>
     23#include <glib.h>
    2424#include <glib-object.h>
    2525#include <libsql/sql_parser.h>
    2626#include <libgda/gda-intl.h>

  • libgda/gda-server-provider.c

    old new  
    2020 * Boston, MA 02111-1307, USA.
    2121 */
    2222
    23 #include <glib/gmessages.h>
     23#include <glib.h>
    2424#include <libgda/gda-server-provider.h>
    2525#include <string.h>
    2626

  • libgda/gda-util.c

    old new  
    2525#include <sys/stat.h>
    2626#include <fcntl.h>
    2727#include <unistd.h>
    28 #include <glib/gfileutils.h>
    29 #include <glib/gmessages.h>
    30 #include <glib/gstrfuncs.h>
     28#include <glib.h>
    3129#include <libsql/sql_parser.h>
    3230#include <libgda/gda-intl.h>
    3331#include <libgda/gda-log.h>

  • libgda/gda-util.h

    old new  
    2323#if !defined(__gda_util_h__)
    2424#  define __gda_util_h__
    2525
    26 #include <glib/ghash.h>
    27 #include <glib/glist.h>
     26#include <glib.h>
    2827#include <libgda/gda-parameter.h>
    2928#include <libgda/gda-row.h>
    3029

  • libgda/gda-value.c

    old new  
    2626#include <string.h>
    2727#include <stdlib.h>
    2828#include <time.h>
    29 #include <glib/gdate.h>
    30 #include <glib/gmessages.h>
    31 #include <glib/gstrfuncs.h>
    32 #include <glib/gstring.h>
     29#include <glib.h>
    3330#include <libgda/gda-intl.h>
    3431#include <libgda/gda-value.h>
    3532#include <libgda/gda-util.h>

  • libgda/gda-value.h

    old new  
    2626#  define __gda_value_h__
    2727
    2828#include <time.h>
    29 #include <glib/glist.h>
    30 #include <glib/gmacros.h>
     29#include <glib.h>
    3130#include <glib-object.h>
    3231#include <libxml/tree.h>
    3332#include <libgda/gda-blob.h>

  • providers/bdb/gda-bdb.h

    old new  
    2525#if defined(HAVE_CONFIG_H)
    2626#endif
    2727
    28 #include <glib/gmacros.h>
     28#include <glib.h>
    2929#include <libgda/gda-intl.h>
    3030#include <libgda/gda-server-provider.h>
    3131#include <libgda/gda-blob.h>

  • providers/freetds/gda-freetds-message.h

    old new  
    2424#if defined(HAVE_CONFIG_H)
    2525#endif
    2626
    27 #include <glib/gmacros.h>
     27#include <glib.h>
    2828#include <libgda/gda-intl.h>
    2929#include <libgda/gda-server-provider.h>
    3030#include <tds.h>

  • providers/freetds/gda-freetds-types.h

    old new  
    2424#if defined(HAVE_CONFIG_H)
    2525#endif
    2626
    27 #include <glib/gmacros.h>
     27#include <glib.h>
    2828#include <libgda/gda-intl.h>
    2929#include <libgda/gda-server-provider.h>
    3030#include <tds.h>

  • providers/freetds/gda-freetds.h

    old new  
    2424#if defined(HAVE_CONFIG_H)
    2525#endif
    2626
    27 #include <glib/gmacros.h>
     27#include <glib.h>
    2828#include <libgda/gda-intl.h>
    2929#include <libgda/gda-server-provider.h>
    3030#include <tds.h>

  • providers/ibmdb2/gda-ibmdb2-types.h

    old new  
    2222#if !defined(__gda_ibmdb2_types_h__)
    2323#  define __gda_ibmdb2_types_h__
    2424
    25 #include <glib/gmacros.h>
     25#include <glib.h>
    2626#include <libgda/gda-intl.h>
    2727#include <libgda/gda-server-provider.h>
    2828#include <sqlcli1.h>

  • providers/ibmdb2/gda-ibmdb2.h

    old new  
    2323#if !defined(__gda_ibmdb2_h__)
    2424#  define __gda_ibmdb2_h__
    2525
    26 #include <glib/gmacros.h>
     26#include <glib.h>
    2727#include <libgda/gda-intl.h>
    2828#include <libgda/gda-connection.h>
    2929#include <libgda/gda-server-provider.h>

  • providers/ldap/gda-ldap.h

    old new  
    2626#if !defined(__gda_ldap_h__)
    2727#  define __gda_ldap_h__
    2828
    29 #include <glib/gmacros.h>
     29#include <glib.h>
    3030#include <libgda/gda-connection.h>
    3131#include <libgda/gda-server-provider.h>
    3232#include <libgda/gda-intl.h>

  • providers/mdb/gda-mdb-provider.c

    old new  
    2121 */
    2222
    2323#include <stdlib.h>
    24 #include <glib/gbacktrace.h>
     24#include <glib.h>
    2525#include <libgda/gda-data-model-array.h>
    2626#include <libgda/gda-data-model-list.h>
    2727#include <libgda/gda-table.h>

  • providers/mdb/gda-mdb.h

    old new  
    2323#if !defined(__gda_mdb_h__)
    2424#  define __gda_mdb_h__
    2525
    26 #include <glib/gmacros.h>
     26#include <glib.h>
    2727#include <libgda/gda-connection.h>
    2828#include <libgda/gda-server-provider.h>
    2929#include <libgda/gda-intl.h>

  • providers/msql/gda-msql.h

    old new  
    2222#ifndef __gda_msql_h__
    2323#define __gda_msql_h__
    2424
    25 #include <glib/gmacros.h>
     25#include <glib.h>
    2626#include <libgda/gda-connection.h>
    2727#include <libgda/gda-server-provider.h>
    2828#include <libgda/gda-intl.h>

  • providers/mysql/gda-mysql.h

    old new  
    2525#if !defined(__gda_mysql_h__)
    2626#  define __gda_mysql_h__
    2727
    28 #include <glib/gmacros.h>
     28#include <glib.h>
    2929#include <libgda/gda-connection.h>
    3030#include <libgda/gda-server-provider.h>
    3131#include <libgda/gda-intl.h>

  • providers/odbc/gda-odbc.h

    old new  
    2525#if !defined(__gda_odbc_h__)
    2626#  define __gda_odbc_h__
    2727
    28 #include <glib/gmacros.h>
     28#include <glib.h>
    2929#include <glib-object.h>
    3030#include <libgda/gda-intl.h>
    3131#include <libgda/gda-server-provider.h>

  • providers/oracle/gda-oracle.h

    old new  
    3131#if defined(HAVE_CONFIG_H)
    3232#endif
    3333
    34 #include <glib/gmacros.h>
     34#include <glib.h>
    3535#include <libgda/gda-connection.h>
    3636#include <libgda/gda-server-provider.h>
    3737#include <libgda/gda-intl.h>

  • providers/postgres/gda-postgres.h

    old new  
    2727#if defined(HAVE_CONFIG_H)
    2828#endif
    2929
    30 #include <glib/gmacros.h>
     30#include <glib.h>
    3131#include <libgda/gda-intl.h>
    3232#include <libgda/gda-server-provider.h>
    3333#include <libgda/gda-blob.h>

  • providers/sqlite/gda-sqlite.h

    old new  
    2424#if !defined(__gda_sqlite_h__)
    2525#  define __gda_sqlite_h__
    2626
    27 #include <glib/gmacros.h>
    28 #include <glib/gtypes.h>
     27#include <glib.h>
    2928#include <libgda/gda-value.h>
    3029#include <sqlite3.h>
    3130

  • providers/sybase/gda-sybase.h

    old new  
    3232#  include <config.h>
    3333#endif
    3434
    35 #include <glib/gmacros.h>
     35#include <glib.h>
    3636#include <libgda/gda-intl.h>
    3737#include <libgda/gda-server-provider.h>
    3838#include <ctpublic.h>

  • providers/xml/gda-xml.h

    old new  
    2424#if !defined(__gda_xml_h__)
    2525#  define __gda_xml_h__
    2626
    27 #include <glib/gmacros.h>
     27#include <glib.h>
    2828#include <libgda/gda-intl.h>
    2929#include <libgda/gda-xml-database.h>
    3030#include "gda-xml-provider.h"