Attachment #304687 for bug #401331

View | Details | Raw Unified | Return to bug 401331
Collapse All | Expand All




#define G_LOG_DOMAIN "Dia"

#include <glib.h>
#if !GLIB_CHECK_VERSION(2,31,0)
 #include <glib-object.h>
 #if GLIB_CHECK_VERSION(2,16,0)
  #include <glib/gtestutils.h>
 #endif /* GLIB_CHECK_VERSION(2,16,0) */
#endif /* !GLIB_CHECK_VERSION(2.31.0) */

#include "object.h"
#include "plug-ins.h"

Lines 27-34 Link Here

(-)objects/custom/shape_typeinfo.c.orig (+6 lines)
27	#include "custom_util.h"	27	#include "custom_util.h"
28	#include <string.h>	28	#include <string.h>
29	#include <stdarg.h>	29	#include <stdarg.h>
		30
		31	#if !GLIB_CHECK_VERSION(2, 31, 0)
30	#include <glib/gstrfuncs.h>	32	#include <glib/gstrfuncs.h>
31	#include <glib/gstdio.h>	33	#include <glib/gstdio.h>
		34	#else
		35	#include <glib.h>
		36	#endif
		37
32	#include <libxml/parser.h>	38	#include <libxml/parser.h>
33		39
34	/*	40	/*




#define G_LOG_DOMAIN "Dia"

#include <glib.h>
#if !GLIB_CHECK_VERSION(2,31,0)
 #include <glib-object.h>
 #if GLIB_CHECK_VERSION(2,16,0)
  #include <glib/gtestutils.h>
 #endif /* GLIB_CHECK_VERSION(2,16,0) */
#endif /* !GLIB_CHECK_VERSION(2,31,0) */

#if GLIB_CHECK_VERSION(2,16,0)
#include <glib/gtestutils.h>
#endif
#include "dialib.h"

/*

Return to bug 401331

Lines 26-36 Link Here

(-)tests/test-objects.c.orig (-5 / +6 lines)
26	#define G_LOG_DOMAIN "Dia"	26	#define G_LOG_DOMAIN "Dia"
27		27
28	#include <glib.h>	28	#include <glib.h>
29	#include <glib-object.h>	29	#if !GLIB_CHECK_VERSION(2,31,0)
30		30	#include <glib-object.h>
31	#if GLIB_CHECK_VERSION(2,16,0)	31	#if GLIB_CHECK_VERSION(2,16,0)
32	#include <glib/gtestutils.h>	32	#include <glib/gtestutils.h>
33	#endif	33	#endif /* GLIB_CHECK_VERSION(2,16,0) */
		34	#endif /* !GLIB_CHECK_VERSION(2.31.0) */
34		35
35	#include "object.h"	36	#include "object.h"
36	#include "plug-ins.h"	37	#include "plug-ins.h"

Lines 26-36 Link Here

(-)tests/test-boundingbox.c.orig (-4 / +6 lines)
26	#define G_LOG_DOMAIN "Dia"	26	#define G_LOG_DOMAIN "Dia"
27		27
28	#include <glib.h>	28	#include <glib.h>
29	#include <glib-object.h>	29	#if !GLIB_CHECK_VERSION(2,31,0)
		30	#include <glib-object.h>
		31	#if GLIB_CHECK_VERSION(2,16,0)
		32	#include <glib/gtestutils.h>
		33	#endif /* GLIB_CHECK_VERSION(2,16,0) */
		34	#endif /* !GLIB_CHECK_VERSION(2,31,0) */
30		35
31	#if GLIB_CHECK_VERSION(2,16,0)
32	#include <glib/gtestutils.h>
33	#endif
34	#include "dialib.h"	36	#include "dialib.h"
35		37
36	/*	38	/*