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

Make PLT-reduction work with gcc4, and don't include everything in

Browse Source 
2005-03-20  Matthias Clasen  <mclasen@redhat.com>

	Make PLT-reduction work with gcc4, and don't include
	everything in gdkalias.h:

	* gtk/grk.symbols: Group symbols by header and source file.
	* gtk/makegtkalias.pl: Protect definitions by the same
	preprocessor symbols used to guard the headers. Move
	the alias declarations to a separate file which is
	produced when calling makegtkalias.pl -def
	* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
	this file.
	* gtk/*.c: Include gtkalias.h after the other headers,
	include gtkaliasdef.c at the bottom.
	* gtk/*.h: Small cleanups.
This commit is contained in:
Matthias Clasen
2005-03-20 07:01:23 +00:00
committed by Matthias Clasen
parent b39b0bfc04
commit cca8dd6347
298 changed files with 2537 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtktreemodelsort.c
View File

@ -40,13 +40,13 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtktreemodelsort.h"
#include "gtktreesortable.h"
#include "gtktreestore.h"
#include "gtktreedatalist.h"
#include "gtkintl.h"
#include "gtktreednd.h"
#include "gtkalias.h"
typedef struct _SortElt SortElt;
typedef struct _SortLevel SortLevel;
@ -100,7 +100,7 @@ enum {
#define SORT_ELT(sort_elt) ((SortElt *)sort_elt)
#define SORT_LEVEL(sort_level) ((SortLevel *)sort_level)
#define GET_CHILD_ITER(tree_model_sort,child_iter,sort_iter) gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT (tree_model_sort), child_iter, sort_iter);
#define GET_CHILD_ITER(tree_model_sort,ch_iter,so_iter) gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT (tree_model_sort), ch_iter, so_iter);
#define NO_SORT_FUNC ((GtkTreeIterCompareFunc) 0x1)
@ -2502,3 +2502,6 @@ gtk_tree_model_sort_iter_is_valid (GtkTreeModelSort *tree_model_sort,
return gtk_tree_model_sort_iter_is_valid_helper (iter,
tree_model_sort->root);
}
#define __GTK_TREE_MODEL_SORT_C__
#include "gtkaliasdef.c"