diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 11:25:44 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2013-09-04 11:25:44 -0600 |
| commit | 3bc4f3993b93dbf1f6402e2034a2e20eb07db807 (patch) | |
| tree | 592283e59e121b76355836295d6016fe33cfc5d1 /tools/perf/util/include/linux | |
| parent | 17638db1b88184d8895f3f4551c936d7480a1d3f (diff) | |
| parent | cb3e4330e697dffaf3d9cefebc9c7e7d39c89f2e (diff) | |
| download | cachepc-linux-3bc4f3993b93dbf1f6402e2034a2e20eb07db807.tar.gz cachepc-linux-3bc4f3993b93dbf1f6402e2034a2e20eb07db807.zip | |
Merge remote branch 'origin/master' into next-merge
Diffstat (limited to 'tools/perf/util/include/linux')
| -rw-r--r-- | tools/perf/util/include/linux/string.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/include/linux/string.h b/tools/perf/util/include/linux/string.h index 6f19c548ecc0..97a800738226 100644 --- a/tools/perf/util/include/linux/string.h +++ b/tools/perf/util/include/linux/string.h @@ -1,3 +1,4 @@ #include <string.h> void *memdup(const void *src, size_t len); +int str_append(char **s, int *len, const char *a); |