Compare commits

..

3 Commits

Author SHA1 Message Date
Robert Roth
5522fae242 Prepared release 2.33.91 2016-02-29 23:08:18 +02:00
Cédric Valmary
870dd5afa6 Updated Occitan translation 2016-02-29 19:07:51 +00:00
Kylie McClain
94968b4406 Fix building on musl-libc
libgtop fails to build on musl libc, due to the header
resulting in the headers that would be loaded for libc 5 being
loaded on musl libc.
musl defines headers which are also defined in linux-headers'
in.h, causing redefinition errors.

https://bugzilla.gnome.org/show_bug.cgi?id=760655

Signed-off-by: Benoît Dejean <bdejean@gmail.com>
2016-02-16 18:12:00 +01:00
4 changed files with 17 additions and 12 deletions

5
NEWS
View File

@@ -1,3 +1,8 @@
29 February 2016: Overview of changes in 2.33.91
* Updated translations
* Fix building on must-libc
18 January 2016: Overview of changes in 2.33.4
* On OpenBSD only PID 1 is special

View File

@@ -4,7 +4,7 @@ dnl
m4_define([libgtop_major_version], [2])
m4_define([libgtop_minor_version], [33])
m4_define([libgtop_micro_version], [4])
m4_define([libgtop_micro_version], [91])
m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
dnl increment if the interface has additions, changes, removals.

View File

@@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: libgtop 2.9.91\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop"
"&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2015-04-30 07:47+0000\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=libgtop&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2015-11-10 14:02+0000\n"
"PO-Revision-Date: 2015-10-31 08:15+0200\n"
"Last-Translator: Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>\n"
"Language-Team: Tot en òc (totenoc.eu)\n"
@@ -20,25 +20,25 @@ msgstr ""
"X-Generator: Virtaal 0.7.1\n"
"X-Project-Style: gnome\n"
#: ../lib/read.c:51
#: ../lib/read.c:49
#, c-format
msgid "read %d byte"
msgid_plural "read %d bytes"
msgstr[0] "%d octet legit"
msgstr[1] "%d octets legits"
#: ../lib/read_data.c:51
#: ../lib/read_data.c:49
msgid "read data size"
msgstr "talha de las donadas legidas"
#: ../lib/read_data.c:70
#: ../lib/read_data.c:66
#, c-format
msgid "read %lu byte of data"
msgid_plural "read %lu bytes of data"
msgstr[0] "lectura de %lu octet de donadas"
msgstr[1] "lectura de %lu octets de donadas"
#: ../lib/write.c:51
#: ../lib/write.c:49
#, c-format
msgid "wrote %d byte"
msgid_plural "wrote %d bytes"

View File

@@ -34,7 +34,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
#if !defined (__GLIBC__) || __GNU_LIBRARY__ > 1
/* GNU LibC */
#include <net/if.h>
#include <netinet/ip_icmp.h>
@@ -43,7 +43,7 @@
#include <netinet/tcp.h>
#include <netinet/udp.h>
#include <net/if.h>
#else /* Libc 5 */
#elif defined (__GLIBC__) /* Libc 5 */
#include <linux/if.h>
#include <linux/in.h>
#include <linux/ip.h>