11 files changed, 17 insertions, 353 deletions
diff --git a/perf/Makefile.am b/perf/Makefile.am
deleted file mode 100644
index 40b35bc38..000000000
--- a/perf/Makefile.am
+++ /dev/null
@@ -1,154 +0,0 @@
-include $(top_srcdir)/build/Makefile.am.common
-
-include $(top_srcdir)/perf/Makefile.sources
-
-AM_CPPFLAGS =					\
-	-I$(srcdir)				\
-	-I$(top_srcdir)/boilerplate		\
-	-I$(top_srcdir)/src			\
-	-I$(top_srcdir)/util/cairo-missing	\
-	-I$(top_srcdir)/util/cairo-script	\
-	-I$(top_builddir)/src			\
-	$(CAIRO_CFLAGS)
-
-AM_LDFLAGS = $(CAIRO_LDFLAGS)
-
-SUBDIRS = micro
-
-noinst_PROGRAMS = \
-	cairo-analyse-trace \
-	cairo-perf-trace \
-	cairo-perf-micro \
-	$(NULL)
-
-EXTRA_PROGRAMS += \
-	cairo-analyse-trace \
-	cairo-perf-micro \
-	cairo-perf-trace \
-	cairo-perf-diff-files \
-	cairo-perf-print \
-	cairo-perf-chart \
-	cairo-perf-compare-backends \
-	cairo-perf-graph-files \
-	$(NULL)
-EXTRA_DIST += cairo-perf-diff COPYING
-EXTRA_LTLIBRARIES += libcairoperf.la
-
-LDADD = libcairoperf.la \
-	$(top_builddir)/boilerplate/libcairoboilerplate.la \
-	$(top_builddir)/src/libcairo.la
-
-cairo_perf_micro_SOURCES = $(cairo_perf_micro_sources)
-cairo_perf_micro_LDADD = \
-	$(top_builddir)/perf/micro/libcairo-perf-micro.la \
-	$(LDADD)
-cairo_perf_micro_DEPENDENCIES = \
-	$(top_builddir)/perf/micro/libcairo-perf-micro.la \
-	$(LDADD)
-
-libcairoperf_la_SOURCES = \
-	$(libcairoperf_sources)	\
-	$(libcairoperf_external_sources) \
-	$(libcairoperf_headers) \
-	$(NULL)
-
-cairo_analyse_trace_SOURCES = \
-	$(cairo_analyse_trace_sources)	\
-	$(cairo_analyse_trace_external_sources)
-cairo_analyse_trace_LDADD =		\
-	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
-	$(top_builddir)/util/cairo-missing/libcairo-missing.la \
-	$(LDADD)
-cairo_analyse_trace_DEPENDENCIES = \
-	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
-	$(top_builddir)/util/cairo-missing/libcairo-missing.la \
-	$(LDADD)
-
-cairo_perf_trace_SOURCES = \
-	$(cairo_perf_trace_sources)	\
-	$(cairo_perf_trace_external_sources)
-cairo_perf_trace_LDADD =		\
-	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
-	$(top_builddir)/util/cairo-missing/libcairo-missing.la \
-	$(LDADD)
-cairo_perf_trace_DEPENDENCIES = \
-	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
-	$(top_builddir)/util/cairo-missing/libcairo-missing.la \
-	$(LDADD)
-
-cairo_perf_diff_files_SOURCES =	$(cairo_perf_diff_files_sources)
-cairo_perf_print_SOURCES = $(cairo_perf_print_sources)
-cairo_perf_chart_SOURCES = $(cairo_perf_chart_sources)
-cairo_perf_compare_backends_SOURCES = $(cairo_perf_compare_backends_sources)
-
-cairo_perf_graph_files_SOURCES = \
-	$(cairo_perf_graph_files_sources)	\
-	$(cairo_perf_graph_files_headers)
-cairo_perf_graph_files_CFLAGS = @gtk_CFLAGS@
-cairo_perf_graph_files_LDADD = @gtk_LIBS@ $(LDADD)
-
-# Install rules to rebuild the libraries and add explicit dependencies
-$(top_builddir)/perf/micro/libcairo-perf-micro.la:
-	cd $(top_builddir)/perf/micro && $(MAKE) $(AM_MAKEFLAGS) libcairo-perf-micro.la
-
-$(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la
-	cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la
-
-$(top_builddir)/src/libcairo.la:
-	cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) libcairo.la
-
-$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la: $(top_builddir)/src/libcairo.la
-	cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libcairo-script-interpreter.la
-
-
-# Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that
-# one can limit tested targets both through CAIRO_TEST_TARGET env var
-# and TARGETS make var on the command line.  Same for the rest.
-TARGETS = $(CAIRO_TEST_TARGET)
-TARGETS_EXCLUDE = $(CAIRO_TEST_TARGET_EXCLUDE)
-FORMAT = $(CAIRO_TEST_TARGET_FORMAT)
-ITERS = $(CAIRO_PERF_ITERATIONS)
-
-CAIRO_PERF_ENVIRONMENT = CAIRO_PERF_ITERATIONS="$(ITERS)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_FORMAT="$(FORMAT)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)"
-
-perf: cairo-perf-micro$(EXEEXT) cairo-perf-trace$(EXEEXT)
-	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-micro$(EXEEXT)
-	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-trace$(EXEEXT)
-
-html-local: index.html
-
-perf-tag.html : cairo-perf-micro${EXEEXT}
-	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h $@ `git describe --abbrev=0` HEAD
-perf-commit.html : cairo-perf-micro${EXEEXT}
-	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h $@ HEAD
-
-# Summarise changes in index.html, with details in links
-index.html: perf-tag.html perf-commit.html
-	echo "<html><head><title>Performance Changes</title></head><body>Against <a href=\"perf-tag.html\">"`git describe --abbrev=0`"</a><br><a href=\"perf-commit.html\">Latest commit</a></body>" > $@
-
-EXTRA_VALGRIND_FLAGS = $(CAIRO_EXTRA_VALGRIND_FLAGS)
-VALGRIND_MEMCHECK_FLAGS = \
-	--tool=memcheck \
-	--suppressions=$(top_srcdir)/test/.valgrind-suppressions \
-	--leak-check=yes --show-reachable=yes
-VALGRIND_CALLGRIND_FLAGS = \
-	--tool=callgrind
-CLEANFILES += \
-	valgrind-log \
-	callgrind.out.* \
-	index.html
-
-perf-valgrind:
-	$(MAKE) $(AM_MAKEFLAGS) perf \
-	    $(top_builddir)/libtool --mode=execute \
-	    valgrind $(VALGRIND_MEMCHECK_FLAGS) $(EXTRA_VALGRIND_FLAGS)' \
-	    | tee valgrind-log
-
-perf-callgrind:
-	$(MAKE) $(AM_MAKEFLAGS) perf \
-	    $(top_builddir)/libtool --mode=execute \
-	    valgrind $(VALGRIND_CALLGRIND_FLAGS) $(EXTRA_VALGRIND_FLAGS)'
-
-.PHONY: perf perf-valgrind perf-callgrind
-
-EXTRA_DIST += Makefile.win32
diff --git a/perf/Makefile.sources b/perf/Makefile.sources
deleted file mode 100644
index 1fcf14809..000000000
--- a/perf/Makefile.sources
+++ /dev/null
@@ -1,38 +0,0 @@
-libcairoperf_sources = \
-	cairo-perf.c		\
-	cairo-perf-report.c	\
-	cairo-stats.c		\
-	$(NULL)
-
-libcairoperf_external_sources = ../src/cairo-time.c
-
-libcairoperf_headers = \
-	cairo-perf.h   \
-	cairo-stats.h  \
-	$(NULL)
-
-cairo_analyse_trace_sources = cairo-analyse-trace.c
-cairo_analyse_trace_external_sources = ../src/cairo-error.c
-
-cairo_perf_trace_sources = cairo-perf-trace.c
-cairo_perf_trace_external_sources = \
-	../src/cairo-error.c \
-	../src/cairo-hash.c \
-	$(NULL)
-
-cairo_perf_micro_sources = cairo-perf-micro.c
-
-cairo_perf_diff_files_sources =	cairo-perf-diff-files.c
-
-cairo_perf_print_sources = cairo-perf-print.c
-
-cairo_perf_chart_sources = cairo-perf-chart.c
-
-cairo_perf_compare_backends_sources = cairo-perf-compare-backends.c
-
-cairo_perf_graph_files_sources =	\
-	cairo-perf-graph-files.c	\
-	cairo-perf-graph-widget.c	\
-	$(NULL)
-
-cairo_perf_graph_files_headers = cairo-perf-graph.h
diff --git a/perf/Makefile.win32 b/perf/Makefile.win32
deleted file mode 100644
index 084abf00e..000000000
--- a/perf/Makefile.win32
+++ /dev/null
@@ -1,78 +0,0 @@
-top_srcdir = ..
-include $(top_srcdir)/build/Makefile.win32.common
-include $(top_srcdir)/perf/Makefile.sources
-
-CFLAGS += -I$(top_srcdir)/boilerplate -I$(top_srcdir)/util/cairo-script/
-
-PERF_LIBS = \
-	  $(CFG)/libcairoperf.lib	\
-	  $(top_builddir)/boilerplate/$(CFG)/boiler.lib	\
-	  $(top_builddir)/src/$(CFG)/cairo-static.lib	\
-	  $(NULL)
-
-PERF_EXES = \
-	  $(CFG)/cairo-perf-trace.exe	\
-	  $(CFG)/cairo-perf-micro.exe	\
-	  $(CFG)/cairo-perf-diff-files.exe	\
-	  $(CFG)/cairo-perf-print.exe	\
-	  $(CFG)/cairo-perf-chart.exe	\
-	  $(CFG)/cairo-perf-compare-backends.exe	\
-	  $(NULL)
-
-all: inform $(PERF_EXES)
-
-perf: inform $(CFG)/cairo-perf-micro.exe
-	./$(CFG)/cairo-perf-micro.exe
-
-
-libcairoperf_OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(libcairoperf_sources))
-
-$(CFG)/libcairoperf.lib: $(libcairoperf_OBJECTS)
-	@$(AR) $(CAIRO_ARFLAGS) -OUT:$@ $(libcairoperf_OBJECTS)
-
-cairo_perf_trace_OBJECTS = \
-	$(patsubst %.c, $(CFG)/%-static.obj, $(cairo_perf_trace_sources))		\
-	$(top_builddir)/util/cairo-script/$(CFG)/libcairo-script-interpreter.lib	\
-	$(NULL)
-
-cairo_perf_micro_OBJECTS = \
-	$(patsubst %.c, $(CFG)/%-static.obj, $(cairo_perf_micro_sources))	\
-	./micro/$(CFG)/libcairo-perf-micro.lib 					\
-	$(NULL)
-
-cairo_perf_diff_files_OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(cairo_perf_diff_files_sources))
-cairo_perf_print_OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(cairo_perf_print_sources))
-cairo_perf_chart_OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(cairo_perf_chart_sources))
-cairo_perf_compare_backends_OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(cairo_perf_compare_backends_sources))
-
-
-$(CFG)/cairo-perf-trace.exe: $(cairo_perf_trace_OBJECTS) $(PERF_LIBS)
-	@$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(cairo_perf_trace_OBJECTS) $(PERF_LIBS) $(CAIRO_LIBS)
-
-$(CFG)/cairo-perf-micro.exe: $(cairo_perf_micro_OBJECTS) $(PERF_LIBS)
-	@$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(cairo_perf_micro_OBJECTS) $(PERF_LIBS) $(CAIRO_LIBS)
-
-$(CFG)/cairo-perf-diff-files.exe: $(cairo_perf_diff_files_OBJECTS) $(PERF_LIBS)
-	@$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(cairo_perf_diff_files_OBJECTS) $(PERF_LIBS) $(CAIRO_LIBS)
-
-$(CFG)/cairo-perf-print.exe: $(cairo_perf_print_OBJECTS) $(PERF_LIBS)
-	@$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(cairo_perf_print_OBJECTS) $(PERF_LIBS) $(CAIRO_LIBS)
-
-$(CFG)/cairo-perf-chart.exe: $(cairo_perf_chart_OBJECTS) $(PERF_LIBS)
-	@$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(cairo_perf_chart_OBJECTS) $(PERF_LIBS) $(CAIRO_LIBS)
-
-$(CFG)/cairo-perf-compare-backends.exe: $(cairo_perf_compare_backends_OBJECTS) $(PERF_LIBS)
-	@$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(cairo_perf_compare_backends_OBJECTS) $(PERF_LIBS) $(CAIRO_LIBS)
-
-
-./micro/$(CFG)/libcairo-perf-micro.lib:
-	$(MAKE) -C micro -f Makefile.win32
-
-$(top_builddir)/src/$(CFG)/cairo-static.lib:
-	$(MAKE) -C $(top_srcdir)/src -f Makefile.win32
-
-$(top_builddir)/boilerplate/$(CFG)/boiler.lib:
-	$(MAKE) -C $(top_srcdir)/boilerplate -f Makefile.win32
-
-$(top_builddir)/util/cairo-script/$(CFG)/libcairo-script-interpreter.lib:
-	$(MAKE) -C $(top_srcdir)/util/cairo-script -f Makefile.win32
diff --git a/perf/cairo-perf-chart.c b/perf/cairo-perf-chart.c
index 738fe5c7b..9ccb9b42e 100644
--- a/perf/cairo-perf-chart.c
+++ b/perf/cairo-perf-chart.c
@@ -139,7 +139,7 @@ find_ranges (struct chart *chart)
     double test_time;
     int seen_non_null;
     int num_tests = 0;
-    double slow_sum = 0, fast_sum = 0, sum;
+    double slow_sum = 0, fast_sum = 0, sum = 0;
     int slow_count = 0, fast_count = 0;
     int *count;
     int i;
diff --git a/perf/cairo-perf-graph-files.c b/perf/cairo-perf-graph-files.c
index 1fd99e4ad..9a2a325e6 100644
--- a/perf/cairo-perf-graph-files.c
+++ b/perf/cairo-perf-graph-files.c
@@ -25,14 +25,19 @@
  * Authors: Chris Wilson <chris@chris-wilson.co.uk>
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "cairo-perf.h"
 #include "cairo-perf-graph.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
+
+#ifdef G_OS_UNIX
+#include <unistd.h>
 #include <fcntl.h>
+#endif
 
 #include <cairo.h>
 
@@ -232,6 +237,8 @@ show_case_toggled (GtkCellRendererToggle *cell,
     graph_view_update_visible ((GraphView *) app->gv);
 }
 
+#ifdef G_OS_UNIX
+
 static gboolean
 git_read (GIOChannel	   *io,
 	  GIOCondition	    cond,
@@ -300,6 +307,8 @@ do_git (struct _app_data  *app,
     g_io_add_watch (app->git_io, G_IO_IN | G_IO_HUP, (GIOFunc) git_read, app);
 }
 
+#endif
+
 static void
 gv_report_selected (GraphView	     *gv,
 		    int 	      i,
@@ -327,7 +336,11 @@ gv_report_selected (GraphView	     *gv,
 	argv[3] = id;
 	argv[4] = NULL;
 
+#ifdef G_OS_UNIX
 	do_git (app, argv);
+#else
+        g_print ("id: %s\n", id);
+#endif
 	g_free (id);
     }
 }
diff --git a/perf/cairo-perf-graph-widget.c b/perf/cairo-perf-graph-widget.c
index e56eee1bc..9da0abbfe 100644
--- a/perf/cairo-perf-graph-widget.c
+++ b/perf/cairo-perf-graph-widget.c
@@ -25,6 +25,8 @@
  * Authors: Chris Wilson <chris@chris-wilson.co.uk>
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "cairo-perf.h"
 #include "cairo-perf-graph.h"
 
diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c
index ebef8eb59..244d6cb74 100644
--- a/perf/cairo-perf.c
+++ b/perf/cairo-perf.c
@@ -37,7 +37,6 @@
 #endif
 
 #if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #elif defined(_POSIX_PRIORITY_SCHEDULING)
 #include <sched.h>
diff --git a/perf/dirent-win32.h b/perf/dirent-win32.h
index 0f2ed05e5..435a6cfa2 100644
--- a/perf/dirent-win32.h
+++ b/perf/dirent-win32.h
@@ -26,7 +26,6 @@
 
 #include "cairo-compiler-private.h"
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #define stat _stat
diff --git a/perf/micro/Makefile.am b/perf/micro/Makefile.am
deleted file mode 100644
index 3edbf531c..000000000
--- a/perf/micro/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-include $(top_srcdir)/build/Makefile.am.common
-
-include $(top_srcdir)/perf/micro/Makefile.sources
-
-noinst_LTLIBRARIES = libcairo-perf-micro.la
-libcairo_perf_micro_la_SOURCES = \
-	$(libcairo_perf_micro_sources)	\
-	$(libcairo_perf_micro_headers)
-
-AM_CPPFLAGS =				\
-	-I$(srcdir)			\
-	-I$(top_srcdir)/boilerplate	\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/perf		\
-	-I$(top_builddir)/src		\
-	$(CAIRO_CFLAGS)
diff --git a/perf/micro/Makefile.sources b/perf/micro/Makefile.sources
deleted file mode 100644
index 19ead179d..000000000
--- a/perf/micro/Makefile.sources
+++ /dev/null
@@ -1,51 +0,0 @@
-libcairo_perf_micro_sources = \
-	cairo-perf-cover.c	\
-	box-outline.c		\
-	composite-checker.c	\
-	disjoint.c		\
-	fill.c			\
-	hatching.c		\
-	hash-table.c		\
-	line.c			\
-	a1-line.c		\
-	long-lines.c		\
-	mosaic.c		\
-	paint.c			\
-	paint-with-alpha.c	\
-	mask.c			\
-	pattern_create_radial.c \
-	rectangles.c		\
-	rounded-rectangles.c	\
-	stroke.c		\
-	subimage_copy.c		\
-	tessellate.c		\
-	text.c			\
-	tiger.c			\
-	glyphs.c		\
-	twin.c			\
-	unaligned-clip.c	\
-	wave.c			\
-	world-map.c		\
-	zrusin.c		\
-	long-dashed-lines.c	\
-	dragon.c		\
-	pythagoras-tree.c	\
-	intersections.c		\
-	many-strokes.c		\
-	wide-strokes.c		\
-	many-fills.c		\
-	wide-fills.c		\
-	many-curves.c		\
-	curve.c			\
-	a1-curve.c		\
-	spiral.c		\
-	pixel.c			\
-	sierpinski.c		\
-	fill-clip.c		\
-	$(NULL)
-
-libcairo_perf_micro_headers = \
-	mosaic.h		\
-	world-map.h		\
-	zrusin-another.h	\
-	$(NULL)
diff --git a/perf/micro/Makefile.win32 b/perf/micro/Makefile.win32
deleted file mode 100644
index f41f781d7..000000000
--- a/perf/micro/Makefile.win32
+++ /dev/null
@@ -1,12 +0,0 @@
-top_srcdir = ../..
-include $(top_srcdir)/build/Makefile.win32.common
-include $(top_srcdir)/perf/micro/Makefile.sources
-
-CFLAGS += -I$(top_srcdir)/perf -I$(top_srcdir)/boilerplate/
-
-OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(libcairo_perf_micro_sources))
-
-all: inform $(CFG)/libcairo-perf-micro.lib
-
-$(CFG)/libcairo-perf-micro.lib: $(OBJECTS)
-	@$(AR) $(CAIRO_ARFLAGS) -OUT:$@ $(OBJECTS)