1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
Description: Update to the newest libixp
Author: Andrew O. Shadoura <bugzilla@tut.by>
--- wmii-3.9.2+debian.orig/config.mk
+++ wmii-3.9.2+debian/config.mk
@@ -33,7 +33,7 @@ AR = ar crs
X11PACKAGES = xft
INCX11 = $$(pkg-config --cflags $(X11PACKAGES))
LIBICONV = # Leave blank if your libc includes iconv (glibc does)
-LIBIXP = $(ROOT)/lib/libixp.a
+LIBIXP = /usr/lib/libixp.a
# Your make shell. By default, the first found of /bin/dash, /bin/ksh,
# /bin/sh. Except with bsdmake, which assumes /bin/sh is sane. bash and zsh
--- wmii-3.9.2+debian.orig/Makefile
+++ wmii-3.9.2+debian/Makefile
@@ -15,7 +15,6 @@ DIRS = \
libfmt \
libregexp \
libutf \
- libixp \
$(PDIRS)
DOCS = README \
--- wmii-3.9.2+debian.orig/include/ixp_local.h
+++ wmii-3.9.2+debian/include/ixp_local.h
@@ -1,8 +1,17 @@
#define IXP_NO_P9_
-#define IXP_P9_STRUCTS
#include <ixp.h>
#include <stdbool.h>
+#undef ulong
+#define ulong _ixpulong
+typedef unsigned long ulong;
+
+#ifdef CPROTO
+# undef bool
+typedef int bool;
+typedef char* va_list;
+#endif
+
char *argv0;
#define ARGBEGIN \
int _argtmp=0, _inargv=0; char *_argv=nil; \
@@ -66,25 +75,25 @@ struct IxpMap {
};
struct IxpTimer {
- Timer* link;
- long msec;
- long id;
- void (*fn)(long, void*);
- void* aux;
+ Timer* link;
+ uint32_t msec;
+ long id;
+ void (*fn)(long, void*);
+ void* aux;
};
/* map.c */
-void ixp_mapfree(Map*, void(*)(void*));
-void ixp_mapexec(Map*, void(*)(void*, void*), void*);
-void ixp_mapinit(Map*, MapEnt**, int);
-bool ixp_mapinsert(Map*, ulong, void*, bool);
-void* ixp_mapget(Map*, ulong);
-void* ixp_maprm(Map*, ulong);
+void ixp_mapfree(IxpMap*, void(*)(void*));
+void ixp_mapexec(IxpMap*, void(*)(void*, void*), void*);
+void ixp_mapinit(IxpMap*, MapEnt**, int);
+bool ixp_mapinsert(IxpMap*, ulong, void*, bool);
+void* ixp_mapget(IxpMap*, ulong);
+void* ixp_maprm(IxpMap*, ulong);
/* mux.c */
void muxfree(IxpClient*);
void muxinit(IxpClient*);
-Fcall* muxrpc(IxpClient*, Fcall*);
+IxpFcall* muxrpc(IxpClient*, IxpFcall*);
/* timer.c */
long ixp_nexttimer(IxpServer*);
|
