changeset 31149:4c4482625191

merge of '0d389b1a3f186fbbea57629066032e0fe9b7a47d' and '3e1e394a5c30d86e26a1419fbfbc1af5d31dff09'
author Paul Aurich <paul@darkrain42.org>
date Mon, 17 Jan 2011 22:37:30 +0000
parents 84e9eb0ae4d5 (current diff) 28b328da7269 (diff)
children 19e89f916e69
files
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/zephyr/Zinternal.c	Mon Jan 17 22:37:03 2011 +0000
+++ b/libpurple/protocols/zephyr/Zinternal.c	Mon Jan 17 22:37:30 2011 +0000
@@ -30,7 +30,6 @@
 #else
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <utmp.h>
 #endif
 
 int __Zephyr_fd = -1;