remove gcc 2.95 workarounds

This commit is contained in:
naddy
2013-08-07 19:21:08 +00:00
parent b43ec6dca7
commit db19a457d2
2 changed files with 0 additions and 77 deletions
-44
View File
@@ -1,44 +0,0 @@
$OpenBSD: patch-Src_params_c,v 1.1 2012/09/24 19:33:50 pea Exp $
Fix compilation with gcc 2.95.
--- Src/params.c.orig Fri Aug 10 04:06:11 2012
+++ Src/params.c Fri Aug 10 04:06:54 2012
@@ -4209,6 +4209,17 @@ arrfixenv(char *s, char **t)
int
zputenv(char *str)
{
+#ifdef USE_SET_UNSET_ENV
+ char *ptr;
+ int ret;
+#else
+#ifdef HAVE_PUTENV
+#else
+ char **ep;
+ int num_env;
+#endif
+#endif
+
DPUTS(!str, "Attempt to put null string into environment.");
#ifdef USE_SET_UNSET_ENV
/*
@@ -4218,8 +4229,6 @@ zputenv(char *str)
* Unfortunately this is a slightly different interface
* from what zputenv() assumes.
*/
- char *ptr;
- int ret;
for (ptr = str; *ptr && *ptr != '='; ptr++)
;
@@ -4237,10 +4246,6 @@ zputenv(char *str)
#ifdef HAVE_PUTENV
return putenv(str);
#else
- char **ep;
- int num_env;
-
-
/* First check if there is already an environment *
* variable matching string `name'. */
if (findenv(str, &num_env)) {
@@ -1,33 +0,0 @@
$OpenBSD: patch-gtk_gtkprintunixdialog_c,v 1.3 2011/11/10 19:41:02 ajacoutot Exp $
Fix build with gcc 2.
--- gtk/gtkprintunixdialog.c.orig Thu Nov 10 18:38:03 2011
+++ gtk/gtkprintunixdialog.c Thu Nov 10 20:09:57 2011
@@ -2596,12 +2596,15 @@ draw_page_cb (GtkWidget *widget,
GtkNumberUpLayout number_up_layout;
gint start_x, end_x, start_y, end_y;
gint dx, dy;
+ gint font_size;
gboolean horizontal;
GtkPageSetup *page_setup;
gdouble paper_width, paper_height;
gdouble pos_x, pos_y;
gint pages_per_sheet;
gboolean ltr = TRUE;
+ PangoContext *pango_c = NULL;
+ PangoFontDescription *pango_f = NULL;
orientation = gtk_page_setup_get_orientation (priv->page_setup);
landscape =
@@ -2872,9 +2875,7 @@ draw_page_cb (GtkWidget *widget,
font = pango_font_description_new ();
pango_font_description_set_family (font, "sans");
- PangoContext *pango_c = NULL;
- PangoFontDescription *pango_f = NULL;
- gint font_size = 12 * PANGO_SCALE;
+ font_size = 12 * PANGO_SCALE;
pango_c = gtk_widget_get_pango_context (widget);
if (pango_c != NULL)