diff --git a/perf/Makefile.am b/perf/Makefile.am index 35f56f833..f4ce905ad 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -20,9 +20,9 @@ cairo_perf_SOURCES = \ paint.c if CAIRO_HAS_WIN32_SURFACE -cairo_perf_SOURCES += cairo-perf-timer-win32.c +cairo_perf_SOURCES += cairo-perf-win32.c else -cairo_perf_SOURCES += cairo-perf-timer-posix.c +cairo_perf_SOURCES += cairo-perf-posix.c endif LDADD = $(top_builddir)/boilerplate/libcairoboilerplate.la \ diff --git a/perf/cairo-perf-timer-posix.c b/perf/cairo-perf-posix.c similarity index 100% rename from perf/cairo-perf-timer-posix.c rename to perf/cairo-perf-posix.c diff --git a/perf/cairo-perf-timer.h b/perf/cairo-perf-timer.h deleted file mode 100644 index fbe67a37b..000000000 --- a/perf/cairo-perf-timer.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright © 2006 Mozilla Corporation - * Copyright © 2006 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of - * the authors not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. The authors make no representations about the - * suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Authors: Vladimir Vukicevic - * Carl Worth - */ - -#ifndef _TIMER_ALARM_H_ -#define _TIMER_ALARM_H_ - -#include "cairo-perf.h" - -typedef struct _cairo_perf_timer_t cairo_perf_timer_t; - -/* timers */ - -void -timer_start (void); - -void -timer_stop (void); - -double -timer_elapsed (void); - -/* yield */ - -void -yield (void); - -#endif diff --git a/perf/cairo-perf-timer-win32.c b/perf/cairo-perf-win32.c similarity index 100% rename from perf/cairo-perf-timer-win32.c rename to perf/cairo-perf-win32.c diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h index d9e5ad83f..34d2bbd05 100644 --- a/perf/cairo-perf.h +++ b/perf/cairo-perf.h @@ -30,7 +30,23 @@ #include "cairo-boilerplate.h" -#include "cairo-perf-timer.h" +typedef struct _cairo_perf_timer_t cairo_perf_timer_t; + +/* timers */ + +void +timer_start (void); + +void +timer_stop (void); + +double +timer_elapsed (void); + +/* yield */ + +void +yield (void); typedef double (*cairo_perf_func_t) (cairo_t *cr, int width, int height);