Module Name: src
Committed By: christos
Date: Sun Mar 9 17:07:46 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctfmerge.c
Log Message:
fix constant name
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.7 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.8
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.7 Sun Mar 9 13:04:00 2014
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Sun Mar 9 13:07:46 2014
@@ -641,7 +641,7 @@ wq_init(workqueue_t *wq, int nfiles)
if (getenv("CTFMERGE_MAX_SLOTS"))
nslots = atoi(getenv("CTFMERGE_MAX_SLOTS"));
else
- nslots = CTFMERGE_MAX_SLOTS;
+ nslots = MERGE_PHASE1_MAX_SLOTS;
if (getenv("CTFMERGE_PHASE1_BATCH_SIZE"))
wq->wq_maxbatchsz = atoi(getenv("CTFMERGE_PHASE1_BATCH_SIZE"));
