oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy needed defines from linux/isdn.h instead of

Browse Source 
including it, unbreaking build with linux 2.6 kernel headers.
This commit is contained in:
Jon Kåre Hellan
2003-12-07 00:10:38 +00:00
parent 310a51dd8f
commit 9ea55a3f4d
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sysdeps/linux/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-12-07 Jon K Hellan <hellan@acm.org>
* ppp.c: Copy needed defines from linux/isdn.h instead of
including it, unbreaking build with linux 2.6 kernel headers.
2003-10-21 Bastien Nocera <hadess@hadess.net> 2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0 * Makefile.am: install only one library, libgtop-2.0

8
sysdeps/linux/ppp.c
View File

@@ -25,7 +25,6 @@
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/ppp.h> #include <glibtop/ppp.h>
#include <linux/isdn.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@@ -34,6 +33,13 @@
#include <glib.h> #include <glib.h>
#ifndef ISDN_MAX_CHANNELS
#define ISDN_MAX_CHANNELS 64
#endif
#ifndef IIOCGETCPS
#define IIOCGETCPS _IO('I',21)
#endif
static const unsigned long _glibtop_sysdeps_ppp = static const unsigned long _glibtop_sysdeps_ppp =
(1L << GLIBTOP_PPP_STATE) + (1L << GLIBTOP_PPP_BYTES_IN) + (1L << GLIBTOP_PPP_STATE) + (1L << GLIBTOP_PPP_BYTES_IN) +
(1L << GLIBTOP_PPP_BYTES_OUT); (1L << GLIBTOP_PPP_BYTES_OUT);