diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-14 21:30:52 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-14 21:30:52 +0200 |
| commit | 25e81ae17ce0dbb745fb38bf80976a8428a8bfd5 (patch) | |
| tree | 1a52b89b2e80669da688475e3a6f2e0c2ddfaa4e /redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch | |
| parent | 6de6c5661d72584cee263f7819e9b897a784ef94 (diff) | |
| download | tde-packaging-25e81ae17ce0dbb745fb38bf80976a8428a8bfd5.tar.gz tde-packaging-25e81ae17ce0dbb745fb38bf80976a8428a8bfd5.zip | |
RPM Packaging: cleanup tdenetwork
Diffstat (limited to 'redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch')
| -rw-r--r-- | redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch b/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch deleted file mode 100644 index 6c3204712..000000000 --- a/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI 2013-06-17 19:40:31.327502606 +0200 -+++ trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp 2013-06-17 19:43:02.745097904 +0200 -@@ -44,32 +44,6 @@ - - #include "kopeteaccountmanager.h" - #include "kopeteaway.h" --/* The following is a hack: -- * e.g. Mandrake 9.x ships with a patched -- * kernel which doesn't define this 64 bit types (we need GNU C lib -- * because we use long long and warning - gcc extensions.) -- * -- * This is caused by the !defined(__STRICT_ANSI__) check in -- * /usr/include/asm/types.h -- */ --#if !defined(__u64) && defined(__GNUC__) --#if SIZEOF_UNSIGNED_LONG >= 8 --typedef unsigned long __u64; --#else --typedef unsigned long long __u64; --#endif --#endif -- --#if !defined(__s64) && defined(__GNUC__) --#if SIZEOF_LONG >= 8 --typedef signed long __s64; --#else --typedef __signed__ long long __s64; --#endif --#endif --/* -- * End hack -- */ - - #include <linux/version.h> - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50) |