Amebis/cld2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue 19: Windows build fails: undeclared identifier 'close'

Browse Source 
https://code.google.com/p/cld2/issues/detail?id=19



git-svn-id: https://cld2.googlecode.com/svn/trunk@166 b252ecd4-b096-bf77-eb8e-91563289f87e
This commit is contained in:
andrewhayden@google.com
2014-08-13 12:35:03 +00:00
parent f7a2267508
commit 7f791121dc
4 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/cld2_dynamic_data_loader.cc
View File

@@ -18,8 +18,8 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include "cld2_dynamic_compat.h" // for win32/posix compatibility
#include "cld2_dynamic_data.h"
#include "cld2_dynamic_data_loader.h"
#include "integral_types.h"
@@ -140,10 +140,16 @@ CLD2DynamicData::FileHeader* loadInternal(FILE* inFile, const void* basePointer,
void unloadDataFile(CLD2::ScoringTables** scoringTables,
void** mmapAddress, uint32_t* mmapLength) {
#ifdef _WIN32
// See https://code.google.com/p/cld2/issues/detail?id=20
fprintf(stderr, "dynamic data unloading from file is not currently supported on win32, use raw mode instead.");
return;
#else // i.e., is POSIX (no support for Mac prior to OSX)
CLD2DynamicDataLoader::unloadDataRaw(scoringTables);
munmap(*mmapAddress, *mmapLength);
*mmapAddress = NULL;
*mmapLength = 0;
#endif // ifdef _WIN32
}
void unloadDataRaw(CLD2::ScoringTables** scoringTables) {
@@ -157,21 +163,28 @@ void unloadDataRaw(CLD2::ScoringTables** scoringTables) {
CLD2::ScoringTables* loadDataFile(const char* fileName,
void** mmapAddressOut, uint32_t* mmapLengthOut) {
#ifdef _WIN32
// See https://code.google.com/p/cld2/issues/detail?id=20
fprintf(stderr, "dynamic data loading from file is not currently supported on win32, use raw mode instead.");
return NULL;
#else // i.e., is POSIX (no support for Mac prior to OSX)
CLD2DynamicData::FileHeader* header = loadHeaderFromFile(fileName);
if (header == NULL) {
return NULL;
}
// Initialize the memory map
int inFileHandle = open(fileName, O_RDONLY);
int inFileHandle = OPEN(fileName, O_RDONLY);
void* mapped = mmap(NULL, header->totalFileSizeBytes,
PROT_READ, MAP_PRIVATE, inFileHandle, 0);
// Record the map address. This allows callers to unmap
*mmapAddressOut=mapped;
*mmapLengthOut=header->totalFileSizeBytes;
close(inFileHandle);
CLOSE(inFileHandle);
return loadDataInternal(header, mapped, header->totalFileSizeBytes);
#endif // ifdef _WIN32
}
CLD2::ScoringTables* loadDataRaw(const void* basePointer, const uint32_t length) {