reordered includes for compatibility with gcc3

benchmarks/arrayListSet.c

@@ -1,7 +1,7 @@
+#include <stasis/transactional.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
 #include <unistd.h>
 
 int main(int argc, char** argv) {

benchmarks/linearHashNTA.c

@@ -1,7 +1,7 @@
+#include <stasis/transactional.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
 #include <unistd.h>
 
 

benchmarks/linkedListNTA.c

@@ -1,7 +1,7 @@
+#include <stasis/transactional.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
 #include <unistd.h>
 
 

benchmarks/naiveHash.c

@@ -1,7 +1,7 @@
+#include <stasis/transactional.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
 #include <unistd.h>
 
 int main(int argc, char** argv) {

benchmarks/naiveMultiThreaded.c

@@ -1,7 +1,7 @@
+#include <stasis/transactional.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
 #include <unistd.h>
 #include <pthread.h>
 static pthread_mutex_t hash_mutex = PTHREAD_MUTEX_INITIALIZER;

benchmarks/pageOrientedListNTA.c

@@ -1,7 +1,7 @@
+#include <stasis/transactional.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
 #include <unistd.h>
 
 //#define CHECK_RESULTS 1

benchmarks/rawSet.c

@@ -1,7 +1,7 @@
+#include <stasis/transactional.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
 #include <unistd.h>
 
 int main(int argc, char** argv) {

benchmarks/sequentialThroughput.c

@@ -1,8 +1,8 @@
+#include <stasis/transactional.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <stasis/transactional.h>
 #include <stasis/bufferManager.h>
 #include <stasis/bufferManager/legacy/legacyBufferManager.h>
 #include <stasis/truncation.h>

benchmarks/slotted.c

@@ -4,12 +4,12 @@
  *  Created on: Jul 15, 2009
  *      Author: sears
  */
+#include <stasis/transactional.h>
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <stasis/transactional.h>
 #include <stasis/bufferManager.h>
 #include <stasis/page/slotted.h>
 

benchmarks/zeroCopy.c

@@ -1,8 +1,9 @@
+#include <stasis/transactional.h>
+#include <stasis/bufferManager.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stasis/transactional.h>
-#include <stasis/bufferManager.h>
 
 #include <unistd.h>
 #include <stasis/page/raw.h>

pbl/pbl.h

@@ -11,6 +11,7 @@
 #define PBL_H
 #ifdef PBL_COMPAT
 
+#include <stasis/common.h>
 #include <stdio.h>
 
 struct  pblHashTable_t;

src/apps/readOnlyHash/buildTable.c

@@ -1,10 +1,11 @@
+#include <stasis/transactional.h>
+#include <stasis/truncation.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
-#include <stasis/transactional.h>
-#include <stasis/truncation.h>
 #include <sys/time.h>
 #include <time.h>
 

src/apps/readOnlyHash/queryTable.c

@@ -1,9 +1,10 @@
+#include <stasis/transactional.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
-#include <stasis/transactional.h>
 
 int main(int argc, char** argv) {
   Tinit();

src/pobj/pobj.c

@@ -1,8 +1,9 @@
+#include <stasis/transactional.h>
+#include <pobj/pobj.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
-#include <stasis/transactional.h>
-#include <pobj/pobj.h>
 #include "common.h"
 #include "debug.h"
 #include "hash.h"

src/stasis/bufferPool.c

@@ -48,10 +48,10 @@ terms specified in this license.
  * $Id$
  *
  */
-#include <assert.h>
+#include <stasis/common.h>
-
 #include <stasis/bufferPool.h>
 #include <stasis/page.h>
+#include <assert.h>
 
 struct stasis_buffer_pool_t {
 	pageid_t nextPage;

src/stasis/operations/lsmTree.c

@@ -1,5 +1,3 @@
-#include <string.h>
-
 #include <stasis/operations/lsmTree.h>
 #include <stasis/truncation.h>
 #include <stasis/constants.h>
@@ -8,7 +6,7 @@
 //  XXX including fixed.h breaks page api encapsulation; we need a "last slot"
 // call.
 #include <stasis/page/fixed.h>
-#include <pthread.h>
+#include <string.h>
 
 static lsm_comparator_t comparators[MAX_LSM_COMPARATORS];
 static lsm_page_initializer_t initializers[MAX_LSM_PAGE_INITIALIZERS];

src/stasis/page/fixed.c

@@ -1,9 +1,11 @@
-#include <assert.h>
+#include <stasis/common.h>
 #include <stasis/page.h>
 #include <stasis/page/fixed.h>
 /** @todo should page implementations provide readLSN / writeLSN??? */
 #include <stasis/truncation.h>
 
+#include <assert.h>
+
 
 
 int stasis_fixed_records_per_page(size_t size) {

src/stasis/recovery2.c

@@ -5,6 +5,7 @@
    Implements three phase recovery
 
 */
+#include <stasis/common.h>
 #include <pbl/pbl.h>
 
 #include <stasis/recovery.h>

stasis/common.h

@@ -60,7 +60,7 @@ terms specified in this license.
 
 #ifndef __stasis_common_h
 #define __stasis_common_h
-
+#define _XOPEN_SOURCE 600
 #include <sys/types.h> // for size_t
 
 #ifdef __cplusplus

stasis/operations/lsmTree.h

@@ -15,8 +15,9 @@
    For now, LSM-trees only support fixed length keys; this restriction
    will be lifted in the future.
 */
-#include <assert.h>
+#include <stasis/common.h>
 #include <stasis/iterator.h>
+#include <assert.h>
 typedef struct {
   recordid treeRoot;
   recordid pos;

stasis/rw.h

@@ -15,14 +15,16 @@
  *                Found the code at this url:
  *                http://www.cs.nmsu.edu/~jcook/Tools/pthreads/rw.c
  */
-#include <pthread.h>
-#include <stasis/common.h>
-#include <stdio.h>
-
 #ifndef __LIBDFA_RW_H
 #define __LIBDFA_RW_H
 
+#include <stasis/common.h>
+#include <pthread.h>
+#include <stdio.h>
+
 BEGIN_C_DECLS
+
+
 #define HAVE_PTHREAD_RWLOCK
 #ifdef HAVE_PTHREAD_RWLOCK
 typedef pthread_rwlock_t rwl;

stasis/transactional.h

@@ -551,7 +551,7 @@ terms specified in this license.
 #ifndef __TRANSACTIONAL_H__
 #define __TRANSACTIONAL_H__
 
-#include "common.h"
+#include <stasis/common.h>
 #include "flags.h"
 BEGIN_C_DECLS
 /**

test/stasis/fault_injection/fitest.h

@@ -44,6 +44,7 @@ terms specified in this license.
 #ifndef FI_TEST_H
 #define FI_TEST_H
 
+#include <stasis/transactional.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,7 +52,6 @@ terms specified in this license.
 #include <assert.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stasis/transactional.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <time.h>