tag 370686 + patch The attached patch fixes compilation of fwbuilder with GCC 4.2 when dropped in to debian/patches. If it would be helpful I can prepare a NMU fixing both this and 385864?
Thanks. -- "You grabbed my hand and we fell into it, like a daydream - or a fever."
This patch fixes a couple of issues with GCC 4.2 due to it being a bit more strict about requiring proper declarations. diff -urN libfwbuilder-2.1.8.orig/src/fwbuilder/dns.cpp libfwbuilder-2.1.8/src/fwbuilder/dns.cpp --- libfwbuilder-2.1.8.orig/src/fwbuilder/dns.cpp 2007-07-15 12:07:58.000000000 +0100 +++ libfwbuilder-2.1.8/src/fwbuilder/dns.cpp 2007-07-15 12:13:38.000000000 +0100 @@ -814,7 +814,7 @@ pthread_attr_destroy(&tattr); } -void* libfwbuilder::DNS_bulkBackResolve_Thread(void *args) +void* DNS_bulkBackResolve_query::DNS_bulkBackResolve_Thread(void *args) { std::ostringstream str; void **void_pair=(void**)args; diff -urN libfwbuilder-2.1.8.orig/src/fwbuilder/dns.h libfwbuilder-2.1.8/src/fwbuilder/dns.h --- libfwbuilder-2.1.8.orig/src/fwbuilder/dns.h 2007-07-15 12:07:58.000000000 +0100 +++ libfwbuilder-2.1.8/src/fwbuilder/dns.h 2007-07-15 12:14:38.000000000 +0100 @@ -223,6 +223,8 @@ private: + static void* DNS_bulkBackResolve_Thread(void *args); + Mutex running_mutex ; Cond running_cond ; unsigned int running_count ; Binary files libfwbuilder-2.1.8.orig/src/fwbuilder/.dns.h.swp and libfwbuilder-2.1.8/src/fwbuilder/.dns.h.swp differ Binary files libfwbuilder-2.1.8.orig/src/fwbuilder/.IPAddress.cpp.swp and libfwbuilder-2.1.8/src/fwbuilder/.IPAddress.cpp.swp differ diff -urN libfwbuilder-2.1.8.orig/src/fwbuilder/IPAddress.h libfwbuilder-2.1.8/src/fwbuilder/IPAddress.h --- libfwbuilder-2.1.8.orig/src/fwbuilder/IPAddress.h 2007-07-15 12:07:58.000000000 +0100 +++ libfwbuilder-2.1.8/src/fwbuilder/IPAddress.h 2007-07-15 12:18:29.000000000 +0100 @@ -144,6 +144,7 @@ friend bool operator==(const Netmask &a, const Netmask &b); }; +Netmask operator~(const Netmask &nm); class IPNetwork; std::vector<IPNetwork> getOverlap(const IPNetwork &n1,const IPNetwork &n2);
signature.asc
Description: Digital signature