Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 160 → Rev 161

/trunk/debian/patches/reg_enum_conflict.patch
0,0 → 1,21
--- a/src/code/ia32.c
+++ b/src/code/ia32.c
@@ -18,6 +18,18 @@
#ifdef REG_NONE
#undef REG_NONE
#endif
+#ifdef REG_EAX
+#undef REG_EAX
+#endif
+#ifdef REG_EBX
+#undef REG_EBX
+#endif
+#ifdef REG_ECX
+#undef REG_ECX
+#endif
+#ifdef REG_EDX
+#undef REG_EDX
+#endif
enum ia32_reg {REG_EAX = 0, REG_EBX = 3, REG_ECX = 1, REG_EDX = 2, REG_NONE = 4};
/trunk/debian/patches/series
8,3 → 8,4
pthread_stub.patch
unbreak_cross_compilation.patch
dump_timeout.patch
reg_enum_conflict.patch
/trunk/debian/changelog
3,8 → 3,10
* Link pike7.8-odbc to unixodbc, not iodbc, since the latter is not
multiarch-aware and not capable of handling the ODBC drivers in
wheezy (Closes: #707911).
* reg_enum_conflict.patch (new): Undefine conflicting REG_* definitions
for now (Closes: #708366).
 
-- Magnus Holmgren <holmgren@debian.org> Mon, 13 May 2013 21:14:34 +0200
-- Magnus Holmgren <holmgren@debian.org> Thu, 23 May 2013 23:10:42 +0200
 
pike7.8 (7.8.700-2) unstable; urgency=low