From 83110e74daf287d1d7f1e24fbe9e2e3495ff6180 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 30 Aug 2010 10:36:59 +0200 Subject: [PATCH] bmon: rediffed and fixed patch which fixes gcc 4 related issues --- network/bmon/gcc-4.0.patch | 45 +++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/network/bmon/gcc-4.0.patch b/network/bmon/gcc-4.0.patch index 8caf3df3a..35a172b78 100644 --- a/network/bmon/gcc-4.0.patch +++ b/network/bmon/gcc-4.0.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../bmon/gcc-4.0.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project +# Copyright (C) 2010 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -13,25 +13,40 @@ # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- bmon-2.1.0/src/out_xml_event.c.vanilla 2005-10-20 15:25:06.000000000 +0200 -+++ bmon-2.1.0/src/out_xml_event.c 2005-10-20 15:25:16.000000000 +0200 -@@ -127,7 +127,7 @@ - .om_draw = xml_event_draw, - .om_set_opts = xml_event_set_opts, - .om_probe = xml_event_probe, -- .om_shutdown xml_event_shutdown, -+ .om_shutdown = xml_event_shutdown, - }; - - static void __init xml_event_init(void) ---- bmon-2.1.0/src/out_audio.c.vanilla 2005-10-20 15:25:26.000000000 +0200 -+++ bmon-2.1.0/src/out_audio.c 2005-10-20 15:25:31.000000000 +0200 + +diff -ruN bmon-2.1.0-orig/src/out_audio.c bmon-2.1.0/src/out_audio.c +--- bmon-2.1.0-orig/src/out_audio.c 2005-04-05 17:01:33.000000000 +0200 ++++ bmon-2.1.0/src/out_audio.c 2010-08-30 10:00:57.456003585 +0200 @@ -141,7 +141,7 @@ .om_draw = audio_draw, .om_set_opts = audio_set_opts, .om_probe = audio_probe, - .om_shutdown audio_shutdown, -+ .om_shutdown = audio_shutdown, ++ .om_shutdown = audio_shutdown }; static void __init audio_init(void) +diff -ruN bmon-2.1.0-orig/src/out_db.c bmon-2.1.0/src/out_db.c +--- bmon-2.1.0-orig/src/out_db.c 2005-04-05 17:01:33.000000000 +0200 ++++ bmon-2.1.0/src/out_db.c 2010-08-30 10:00:57.456003585 +0200 +@@ -679,7 +679,7 @@ + .om_draw = db_draw, + .om_set_opts = db_set_opts, + .om_probe = db_probe, +- .om_shutdown db_shutdown, ++ .om_shutdown = db_shutdown, + }; + + static void __init db_init(void) +diff -ruN bmon-2.1.0-orig/src/out_xml_event.c bmon-2.1.0/src/out_xml_event.c +--- bmon-2.1.0-orig/src/out_xml_event.c 2005-04-05 17:01:33.000000000 +0200 ++++ bmon-2.1.0/src/out_xml_event.c 2010-08-30 10:00:57.456003585 +0200 +@@ -127,7 +127,7 @@ + .om_draw = xml_event_draw, + .om_set_opts = xml_event_set_opts, + .om_probe = xml_event_probe, +- .om_shutdown xml_event_shutdown, ++ .om_shutdown = xml_event_shutdown + }; + + static void __init xml_event_init(void)