Clean up includes for new cmake build system.

This commit is contained in:
Sears Russell 2008-03-02 23:21:39 +00:00
parent 3b74523a53
commit e49d51cb7e
14 changed files with 21 additions and 16 deletions

View file

@ -61,7 +61,7 @@ terms specified in this license.
#endif
#include <stasis/common.h>
#include <latches.h>
#include "latches.h"
#include <assert.h>
#include <stasis/bufferManager.h>
@ -74,6 +74,7 @@ terms specified in this license.
#include <stasis/pageHandle.h>
#include <stasis/lhtable.h>
#include "page.h"
#undef loadPage
#undef releasePage

View file

@ -1,6 +1,6 @@
#include <pthread.h>
#include <config.h>
#include "bufferManager/bufferHash.h"
#include <stasis/bufferManager/bufferHash.h>
#include <stasis/bufferPool.h>
#include <stasis/doubleLinkedList.h>
@ -11,7 +11,7 @@
#include <stasis/replacementPolicy.h>
#include <stasis/bufferManager.h>
#include <stasis/page.h>
#include <assert.h>
//#define LATCH_SANITY_CHECKING

View file

@ -4,8 +4,9 @@
#include <stasis/bufferManager.h>
#include <stasis/bufferPool.h>
#include <stasis/truncation.h>
#include "latches.h"
#include "bufferManager/pageArray.h"
#include <stasis/latches.h>
#include <stasis/bufferManager/pageArray.h>
#include <stasis/page.h>
static Page ** pageMap;
static int pageCount;

View file

@ -54,7 +54,7 @@ terms specified in this license.
#include <stasis/bufferPool.h>
#include <assert.h>
#include <stasis/truncation.h>
#include "page.h"
/* TODO: Combine with buffer size... */
static int nextPage = 0;
static pthread_mutex_t pageMallocMutex;

View file

@ -1,7 +1,7 @@
#include <stasis/consumer.h>
#include <assert.h>
#include <stdlib.h>
#include <logger/logMemory.h>
#include <stasis/logger/logMemory.h>
static lladdConsumer_def_t consumers[MAX_CONSUMER_TYPES];

View file

@ -6,7 +6,7 @@
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <linkedlist.h>
#include <stasis/linkedlist.h>
/**
@file

View file

@ -45,7 +45,7 @@ terms specified in this license.
#include <assert.h>
#include "page.h" // For stasis_record_type_to_size()
#include "../page.h" // For stasis_record_type_to_size()
#include <stasis/logger/logger2.h> // needed for LoggerSizeOfInternalLogEntry()
#include <stasis/logger/logEntry.h>

View file

@ -59,8 +59,8 @@ terms specified in this license.
#include <stasis/crc32.h>
#include "logWriter.h"
#include "logHandle.h"
#include "latches.h"
#include "io.h"
#include <stasis/latches.h>
#include <stasis/io.h>
#include <assert.h>

View file

@ -57,7 +57,7 @@ terms specified in this license.
#include "logWriter.h"
#include "inMemoryLog.h"
#include "page.h"
#include "../page.h"
#ifdef USE_LOGGER
int loggerType = USE_LOGGER;

View file

@ -1,4 +1,4 @@
#include "page/raw.h"
#include <stasis/page/raw.h>
#include <stasis/logger/logger2.h>
#include <stasis/truncation.h>
/**

View file

@ -6,6 +6,9 @@
#include <stasis/bufferPool.h>
#include <stasis/logger/logger2.h>
#include <stasis/truncation.h>
#include "page.h"
void (*pageWrite)(Page * dat);
void (*pageRead)(Page * ret);
void (*forcePageFile)();

View file

@ -47,7 +47,7 @@ terms specified in this license.
* $Id$
*/
#include "page.h"
#include "bufferManager.h"
void bufferPoolInit();

View file

@ -41,7 +41,7 @@ terms specified in this license.
#include <check.h>
#include <config.h>
#include <stasis/common.h>
#include <../../src/stasis/latches.h>
#include <stasis/latches.h>
#include <assert.h>
#include <stasis/transactional.h>

View file

@ -41,7 +41,7 @@ terms specified in this license.
#include <check.h>
#include <config.h>
#include <stasis/common.h>
#include <../../src/stasis/latches.h>
#include <stasis/latches.h>
#include <assert.h>
#include <stasis/transactional.h>