aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext/hashtable.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-29 09:06:20 +0200
committermarha <marha@users.sourceforge.net>2012-05-29 09:06:20 +0200
commit3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8 (patch)
tree4f945d98347a8e736e66af191c0ada59a6ad0a81 /xorg-server/Xext/hashtable.c
parente514bce90660eb2ec76f50af13866f84da93ec60 (diff)
parentce592e25d6303a8f4a8aa0e2918e0f72a35bf175 (diff)
downloadvcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.gz
vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.bz2
vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.zip
Merge remote-tracking branch 'origin/released'
Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
Diffstat (limited to 'xorg-server/Xext/hashtable.c')
-rw-r--r--xorg-server/Xext/hashtable.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/Xext/hashtable.c b/xorg-server/Xext/hashtable.c
index 5cfaeb863..e362ad12f 100644
--- a/xorg-server/Xext/hashtable.c
+++ b/xorg-server/Xext/hashtable.c
@@ -1,6 +1,7 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
+
#include <stdlib.h>
#include "misc.h"
#include "hashtable.h"