diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-10 11:32:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-10 11:32:58 -0700 |
| commit | ddb95de33e99d547c3b533aea12f18c9e4dd649e (patch) | |
| tree | b9d745e3dc1cdd91b0bc938ce104808b2f2db42a /git-compat-util.h | |
| parent | 5242bcbb638f031818e9ebd4467c8e55d5a06bfb (diff) | |
| parent | 6972ab7ae10a205bbc05b98408a36403915a9c39 (diff) | |
| download | git-ddb95de33e99d547c3b533aea12f18c9e4dd649e.tar.gz git-ddb95de33e99d547c3b533aea12f18c9e4dd649e.tar.xz | |
Merge branch 'master' into ph/strbuf
* master:
archive - leakfix for format_subst()
Make --no-thin the default in git-push to save server resources
fix doc for --compression argument to pack-objects
git-tag -s must fail if gpg cannot sign the tag.
git-svn: understand grafts when doing dcommit
git-diff: don't squelch the new SHA1 in submodule diffs
Define NO_MEMMEM on Darwin as it lacks the function
git-svn: fix "Malformed network data" with svn:// servers
(cvs|svn)import: Ask git-tag to overwrite old tags.
git-rebase: fix -C option
git-rebase: support --whitespace=<option>
Documentation / grammer nit
archive: rename attribute specfile to export-subst
archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
add memmem()
Remove unused function convert_sha1_file()
archive: specfile support (--pretty=format: in archive files)
Export format_commit_message()
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index ca0a597a2..1bfbdeb94 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -172,6 +172,12 @@ extern uintmax_t gitstrtoumax(const char *, char **, int); extern const char *githstrerror(int herror); #endif +#ifdef NO_MEMMEM +#define memmem gitmemmem +void *gitmemmem(const void *haystack, size_t haystacklen, + const void *needle, size_t needlelen); +#endif + extern void release_pack_memory(size_t, int); static inline char* xstrdup(const char *str) |