Merge with BOS
authormpm@selenic.com
Sat, 13 Aug 2005 19:43:42 -0800
changeset 896 01215ad04283
parent 867 0cd2ee61b10a (diff)
parent 895 77b52b864249 (current diff)
child 897 fe30f5434b51
Merge with BOS
.hgignore
CONTRIBUTORS
TODO
contrib/patchbomb
doc/hg.1.txt
mercurial/bdiff.c
mercurial/commands.py
mercurial/hg.py
mercurial/hgweb.py
mercurial/revlog.py
mercurial/util.py
templates/map
tests/test-help
tests/test-help.out
tests/test-merge-revert.out
tests/test-merge-revert2
tests/test-merge-revert2.out
tests/test-walk
tests/test-walk.out
--- a/mercurial/bdiff.c	Sat Aug 13 15:26:32 2005 -0800
+++ b/mercurial/bdiff.c	Sat Aug 13 19:43:42 2005 -0800
@@ -12,6 +12,11 @@
 #include <Python.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef __hpux
+#define inline
+#endif
+
 #ifdef _WIN32
 #ifdef _MSC_VER
 #define inline __inline