debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenIndiana and Solaris port

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-10-28 19:46:43 +01:00
committed by Jon Trulson
parent 42e891d9e7
commit 01d6c363fa
296 changed files with 1049 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtinfo/DtMmdb/index/Imakefile
View File

@@ -23,11 +23,11 @@ XCOMM .../programs/dtinfo/mmdb/<subdir>/Imakefile
#define LargePICTable YES
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
DEPEND_DEFINES = $(DEPENDDEFINES)
XCOMM In DtMmdb we compile as C_API sources.
DEFINES = -DC_API -DPORTABLE_DB
INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
SRCS = btree_index.C dyn_disk_index.C dyn_index.C \
dyn_memory_index.C fast_mphf.C hash.C \

8
cde/programs/dtinfo/DtMmdb/index/dyn_index.C
View File

@@ -114,7 +114,7 @@ dyn_index::_insert_loc(data_t& intKey, const oid_t& id)
MESSAGE(cerr, "in dyn_index insert()");
debug(cerr, intKey);
debug(cerr, id);
debug(cerr, pos);
debug(cerr, p);
*/
if ( v_idx_agent_ptr -> member( intKey ) == true ) {
@@ -268,12 +268,12 @@ oid_list_handler* dyn_index::get_loc_list(const handler& t)
) {
//MESSAGE(cerr, "in hash table");
int pos = int(long(intKey -> dt));
//debug(cerr, pos);
int p = int(long(intKey -> dt));
//debug(cerr, p);
delete intKey;
//MESSAGE(cerr, "dyn_index::get_loc_list() done");
return (*v_inv_lists_hd) -> get_list(pos);
return (*v_inv_lists_hd) -> get_list(p);
} else {
//MESSAGE(cerr, "not in hash table");

1
cde/programs/dtinfo/DtMmdb/index/fast_mphf.h
View File

@@ -119,6 +119,7 @@ public:
Boolean init_map_tbls();
// load the MPHF from files
using pstring::asciiIn;
virtual io_status asciiIn(istream&);
// compute a hash value for a key.