[hipl-commit] [trunk] Rev 4173: Remove hacks to work around broken MAEMO environments.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Thu, 8 Apr 2010 14:05:54 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 08/04/2010 at 14:05:54
Revision: 4173
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Remove hacks to work around broken MAEMO environments.
Current MAEMO works fine without it, so there is no more need for the hacks.
Modified:
M hipd/cert.h
M hipd/netdev.h
=== modified file 'hipd/cert.h'
--- hipd/cert.h 2010-03-19 09:00:54 +0000
+++ hipd/cert.h 2010-04-08 11:05:16 +0000
@@ -28,7 +28,6 @@
#include <openssl/err.h>
#include <openssl/pem.h>
-#include "config.h"
#include "lib/core/debug.h"
#include "lib/core/ife.h"
@@ -50,21 +49,4 @@
/** ugly hack for supressing warnings in broken environments */
#define BROKEN_SSL_CONST const
-#ifdef CONFIG_HIP_MAEMO
-/* Fix the maemo environment's broken macros */
-
-/* the version of openssl in maemo4 */
-#if OPENSSL_VERSION_NUMBER == 0x90705f
-#undef BROKEN_SSL_CONST
-#define BROKEN_SSL_CONST
-#endif
-
-#undef SKM_sk_value
-#define SKM_sk_value(type, st, i) \
- ((type *) (void *) sk_value(st, i))
-
-#undef sk_CONF_VALUE_value
-#define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))
-#endif
-
#endif /* HIP_HIPD_CERT_H */
=== modified file 'hipd/netdev.h'
--- hipd/netdev.h 2010-03-19 08:47:02 +0000
+++ hipd/netdev.h 2010-04-08 11:05:16 +0000
@@ -13,7 +13,7 @@
#include <sys/socket.h>
#include <netinet/ip6.h>
#include <openssl/rand.h>
-#include "config.h"
+
#include "lib/tool/nlink.h"
#include "lib/core/list.h"
#include "lib/core/debug.h"
@@ -21,21 +21,6 @@
#include "hit_to_ip.h"
-#ifdef CONFIG_HIP_MAEMO
-/* Fix the maemo environment's broken macros */
-
-#undef NLMSG_NEXT
-#define NLMSG_NEXT(nlh, len) ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
- (struct nlmsghdr *) (void *) (((char *)
(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
-
-#undef IFA_RTA
-#define IFA_RTA(r) ((struct rtattr *) (void *) (((char *) (r)) +
NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
-
-#undef RTA_NEXT
-#define RTA_NEXT(rta, attrlen) ((attrlen) -= RTA_ALIGN((rta)->rta_len), \
- (struct rtattr *) (void *) (((char *) (rta))
+ RTA_ALIGN((rta)->rta_len)))
-#endif
-
struct rtnl_handle;
int hip_devaddr2ifindex(struct in6_addr *addr);
Other related posts:
- » [hipl-commit] [trunk] Rev 4173: Remove hacks to work around broken MAEMO environments. - Diego Biurrun
