1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

- Fix build on FreeBSD 4.X

- Style

PR:		ports/94537
Submitted by:	Tod McQuillin <devin@spamcop.net>
This commit is contained in:
Pav Lucistnik 2006-03-16 15:55:04 +00:00
parent 7d794ef3f3
commit d3171f20bd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=157432
4 changed files with 120 additions and 2 deletions

View File

@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack
USE_GMAKE= yes
GNU_CONFIGURE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

View File

@ -0,0 +1,59 @@
--- magnifier/zoom-region.c~ Tue Feb 14 22:37:24 2006
+++ magnifier/zoom-region.c Thu Mar 16 15:36:55 2006
@@ -1794,10 +1794,10 @@
gdk_window_end_paint (zoom_region->priv->w->window);
g_timer_stop (mag_timing.scale);
if (timing_test) {
- mag_timing.num_scale_samples++;
-
gulong microseconds;
+ mag_timing.num_scale_samples++;
+
mag_timing.scale_val =
g_timer_elapsed (mag_timing.scale,
&microseconds);
@@ -1971,12 +1971,11 @@
float x_scroll_incr, y_scroll_incr;
int width = magnifier->target_bounds.x2 - magnifier->target_bounds.x1;
int height = magnifier->target_bounds.y2 - magnifier->target_bounds.y1;
+ gulong microseconds;
mag_timing.num_frame_samples++;
g_timer_stop (mag_timing.frame);
- gulong microseconds;
-
mag_timing.frame_val = g_timer_elapsed (mag_timing.frame,
&microseconds);
@@ -2094,10 +2093,10 @@
g_timer_stop (mag_timing.idle);
if (timing_test) {
- mag_timing.num_idle_samples++;
-
gulong microseconds;
+ mag_timing.num_idle_samples++;
+
mag_timing.idle_val = g_timer_elapsed (mag_timing.idle,
&microseconds);
mag_timing.idle_total += mag_timing.idle_val;
@@ -2472,6 +2471,7 @@
int screen_height, height;
int pixel_position;
int pixel_direction;
+ gulong microseconds;
screen_height = gdk_screen_get_height (
gdk_display_get_screen (magnifier->source_display,
@@ -2484,8 +2484,6 @@
roi.x2 = zoom_region->roi.x2;
g_timer_stop (mag_timing.process);
-
- gulong microseconds;
total_time = g_timer_elapsed (mag_timing.process, &microseconds);

View File

@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack
USE_GMAKE= yes
GNU_CONFIGURE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

View File

@ -0,0 +1,59 @@
--- magnifier/zoom-region.c~ Tue Feb 14 22:37:24 2006
+++ magnifier/zoom-region.c Thu Mar 16 15:36:55 2006
@@ -1794,10 +1794,10 @@
gdk_window_end_paint (zoom_region->priv->w->window);
g_timer_stop (mag_timing.scale);
if (timing_test) {
- mag_timing.num_scale_samples++;
-
gulong microseconds;
+ mag_timing.num_scale_samples++;
+
mag_timing.scale_val =
g_timer_elapsed (mag_timing.scale,
&microseconds);
@@ -1971,12 +1971,11 @@
float x_scroll_incr, y_scroll_incr;
int width = magnifier->target_bounds.x2 - magnifier->target_bounds.x1;
int height = magnifier->target_bounds.y2 - magnifier->target_bounds.y1;
+ gulong microseconds;
mag_timing.num_frame_samples++;
g_timer_stop (mag_timing.frame);
- gulong microseconds;
-
mag_timing.frame_val = g_timer_elapsed (mag_timing.frame,
&microseconds);
@@ -2094,10 +2093,10 @@
g_timer_stop (mag_timing.idle);
if (timing_test) {
- mag_timing.num_idle_samples++;
-
gulong microseconds;
+ mag_timing.num_idle_samples++;
+
mag_timing.idle_val = g_timer_elapsed (mag_timing.idle,
&microseconds);
mag_timing.idle_total += mag_timing.idle_val;
@@ -2472,6 +2471,7 @@
int screen_height, height;
int pixel_position;
int pixel_direction;
+ gulong microseconds;
screen_height = gdk_screen_get_height (
gdk_display_get_screen (magnifier->source_display,
@@ -2484,8 +2484,6 @@
roi.x2 = zoom_region->roi.x2;
g_timer_stop (mag_timing.process);
-
- gulong microseconds;
total_time = g_timer_elapsed (mag_timing.process, &microseconds);