From d718b58766c31aed412de5846a1c3b9dd5bc758e Mon Sep 17 00:00:00 2001
From: David Kaufmann <astra@ionic.at>
Date: Sat, 21 Jan 2012 00:35:12 +0100
Subject: [PATCH] fix mergesort, Makefile

---
 openmp/merge/Makefile | 2 +-
 openmp/merge/sort.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openmp/merge/Makefile b/openmp/merge/Makefile
index 0f10ac0..a442cb4 100644
--- a/openmp/merge/Makefile
+++ b/openmp/merge/Makefile
@@ -1,7 +1,7 @@
 # GCC Makefile
 
 CC      = gcc
-CFLAGS  = -pedantic -Wall -g -fopenmp -O0
+CFLAGS  = -pedantic -Wall -g -fopenmp -O0 --std=c99 -D_XOPEN_SOURCE
 LDFLAGS = -fopenmp
 
 BINARIES = sort
diff --git a/openmp/merge/sort.c b/openmp/merge/sort.c
index 86a0ca0..8d27047 100644
--- a/openmp/merge/sort.c
+++ b/openmp/merge/sort.c
@@ -1,11 +1,11 @@
 /* implementation of parallel merge sort */
 #include <stdio.h>
-#include <omp.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <omp.h>
 #include "numlist.h"
 
-typedef numtype int;
+typedef int numtype;
 
 void printlist(char * message, numtype * ptr, int len);
 int rank(int elem, numtype * list, int len);
-- 
2.43.0