comparison common.cpp @ 228:acafe033b962 refactoring

Port from trunk/ the fix for linux/OS X ABI mismatches (Use natural alignment for all fields in dbH).
author mas01cr
date Thu, 06 Dec 2007 15:28:40 +0000
parents 2ea1908707c7
children
comparison
equal deleted inserted replaced
227:083956accbce 228:acafe033b962
94 std::cerr << "expected: " << O2_MAGIC << ", got: " << dbH->magic << std::endl; 94 std::cerr << "expected: " << O2_MAGIC << ", got: " << dbH->magic << std::endl;
95 error("database file has incorrect header", dbName); 95 error("database file has incorrect header", dbName);
96 } 96 }
97 97
98 if(dbH->version != O2_FORMAT_VERSION) { 98 if(dbH->version != O2_FORMAT_VERSION) {
99 error("database file has incorect version", dbName); 99 error("database file has incorrect version", dbName);
100 }
101
102 if(dbH->headerSize != O2_HEADERSIZE) {
103 error("sizeof(dbTableHeader) unexpected: platform ABI mismatch?", dbName);
100 } 104 }
101 105
102 CHECKED_MMAP(char *, db, 0, getpagesize()); 106 CHECKED_MMAP(char *, db, 0, getpagesize());
103 107
104 // Make some handy tables with correct types 108 // Make some handy tables with correct types