diff options
author | Emmanuel Dreyfus <manu@netbsd.org> | 2012-08-31 03:23:33 +0200 |
---|---|---|
committer | Anand Avati <avati@redhat.com> | 2012-09-09 11:20:44 -0700 |
commit | 87e88243e827d7c1dc5b5138ac966b41002564e4 (patch) | |
tree | 4142be044ebb4fe86e9d4c903d2317465e4cefb0 /libglusterfs | |
parent | 0b60e7252650355f412974bfc840bc2fc81b4157 (diff) |
Add missing contrib/libgen files to distribution
This is a backport of I3f49eb4a1a186cb2d178539ada6a05c8c1aa8265
BUG: 764655
Change-Id: I32264acec0f122d045f369a254df17b488962b9f
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/3884
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'libglusterfs')
-rw-r--r-- | libglusterfs/src/Makefile.am | 4 | ||||
-rw-r--r-- | libglusterfs/src/compat.c | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index 2dab8735c96..d708f98d205 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -22,7 +22,9 @@ libglusterfs_la_SOURCES = dict.c xlator.c logging.c \ $(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c \ $(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c \ $(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c syncop.c \ - graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c event-history.c + graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c \ + event-history.c \ + $(CONTRIBDIR)/libgen/basename_r.c $(CONTRIBDIR)/libgen/dirname_r.c nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c index 99a0041a5cf..2dcd56a4144 100644 --- a/libglusterfs/src/compat.c +++ b/libglusterfs/src/compat.c @@ -550,10 +550,3 @@ strnlen(const char *string, size_t maxlen) return len; } #endif /* STRNLEN */ - -#ifdef THREAD_UNSAFE_BASENAME -#include "../../contrib/libgen/basename_r.c" -#endif -#ifdef THREAD_UNSAFE_DIRNAME -#include "../../contrib/libgen/dirname_r.c" -#endif |