← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xfce4-netload-plugin/vivid

« back to all changes in this revision

Viewing changes to debian/patches/01_fix-ftbfs-kfreebsd.patch

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez
  • Date: 2010-01-11 23:36:48 UTC
  • Revision ID: james.westby@ubuntu.com-20100111233648-6vvq19cp5atkr0c3
Tags: 0.4.0-4
http://bugs.debian.org/564651
* debian/patches:
  - 01_fix-ftbfs-kfreebsd refreshed, fix FTBFS on kFreeBSD.   closes: #564651

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_fix-ftbfs-kfreebsd.patch
1
 
--- xfce4-netload-plugin-0.4/panel-plugin/net.c 2007-03-21 06:50:46.313144000 +0100
2
 
+++ xfce4-netload-plugin-0.4/panel-plugin/net.c 2007-03-21 06:50:55.000000000 +0100
 
1
diff --git a/panel-plugin/net.c b/panel-plugin/net.c
 
2
index e49390d..2e835c8 100644
 
3
--- a/panel-plugin/net.c
 
4
+++ b/panel-plugin/net.c
3
5
@@ -46,7 +46,7 @@
4
6
 #elif __APPLE__
5
7
 # include "src/macos.h"
9
11
 # include "wormulon/freebsd.h"
10
12
 # include "wormulon/freebsd.c"
11
13
 #elif __linux__
12
 
--- xfce4-netload-plugin-0.4/panel-plugin/net.h 2007-03-21 06:50:25.809095000 +0100
13
 
+++ xfce4-netload-plugin-0.4/panel-plugin/net.h 2007-03-21 06:50:40.000000000 +0100
14
 
@@ -62,7 +62,7 @@
 
14
diff --git a/panel-plugin/net.h b/panel-plugin/net.h
 
15
index ad0c262..4bd20cb 100644
 
16
--- a/panel-plugin/net.h
 
17
+++ b/panel-plugin/net.h
 
18
@@ -62,7 +62,7 @@ typedef struct
15
19
 #ifdef __HPUX__
16
20
     int             wait_pcks_counter;
17
21
     nmapi_logstat*  if_ptr;
20
24
     int             watchif;
21
25
     int             dev_opened;
22
26
 #elif __NetBSD__
23
 
--- xfce4-netload-plugin-0.4/panel-plugin/os.h  2007-03-21 06:49:38.438606000 +0100
24
 
+++ xfce4-netload-plugin-0.4/panel-plugin/os.h  2007-03-21 06:50:09.000000000 +0100
 
27
diff --git a/panel-plugin/os.h b/panel-plugin/os.h
 
28
index 524fefb..e49a356 100644
 
29
--- a/panel-plugin/os.h
 
30
+++ b/panel-plugin/os.h
25
31
@@ -72,7 +72,7 @@
26
32
 #include <net/if_media.h>
27
33
 #include <net/if_mib.h>
31
37
 #include <stdio.h>
32
38
 #include <stdlib.h>
33
39
 #include <stdarg.h>
 
40
@@ -94,8 +94,10 @@
 
41
 #include <net/if_media.h>
 
42
 #include <net/if_mib.h>
 
43
 #include <arpa/inet.h>
 
44
+#if (__FreeBSD_kernel__ < 8) && (__FreeBSD__ < 8)
 
45
 #include <net/ppp_defs.h>
 
46
 #include <net/if_ppp.h>
 
47
+#endif
 
48
 #elif __NetBSD__            /* N E T B S D */
 
49
 #include <stdio.h>
 
50
 #include <sys/param.h>