add m

diff --git a/openmp/merge/sort.c b/openmp/merge/sort.c
index e18d1c838606cfd8aeeccc49caf64a87f2598cd4..03ed112c9344d480fd27102d4b49eda688b18115 100644 (file)
--- a/openmp/merge/sort.c
+++ b/openmp/merge/sort.c
@@ -13,7 +13,7 @@ int rank(int elem, int * list);
 void merge(int ti, ATYPE * a, int n, ATYPE * b, int m, ATYPE * c);
 
 int main ( int argc, char ** argv) {
-       int n = LISTSIZE;
+       int n = LISTSIZE, m = LISTSIZE;
        int p = 1;
        int opt, i;
        int a_len, b_len, b_len_end, b_len_begin;
@@ -43,7 +43,7 @@ int main ( int argc, char ** argv) {
        startTime = omp_get_wtime();
 
        a_len = n/p;
-       #pragma omp parallel for shared(a,b,c,n,p,a_len) private(i,b_len_begin,b_len_end,b_len)
+       #pragma omp parallel for shared(a,b,c,n,m,p,a_len) private(i,b_len_begin,b_len_end,b_len)
        for (i = 0; i < p; i++) {
                b_len_begin = rank(a[i*a_len], b);
                b_len_end = rank(a[(i+1)*a_len], b);
@@ -82,7 +82,7 @@ void printlist(char * message, ATYPE * ptr) {
        printf ("\n");
 }
 
-int rank(int elem, ATYPE * list) {
+int rank(ATYPE elem, ATYPE * list) {
        int pos;
 
        pos = 0;