Mercurial > hg

changeset 896:01215ad04283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with BOS
author mpm@selenic.com
date Sat, 13 Aug 2005 19:43:42 -0800
parents 0cd2ee61b10a (diff) 77b52b864249 (current diff)
children fe30f5434b51
files .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
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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