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

Fix dtinfo document build on OpenBSD

Browse Source
This commit is contained in:
Ulrich Wilkens
2016-06-10 06:31:28 +02:00
committed by Jon Trulson
parent 4aedbf2796
commit 574cf20b31
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cde/programs/dtinfo/DtMmdb/hmphf/mphf_funcs.C
View File

@@ -235,16 +235,6 @@ int write_spec(buckets& bs, params& pms, buffer& mphf_buffer)
mphf_buffer.expand_chunk(spec_bytes); mphf_buffer.expand_chunk(spec_bytes);
/*
mphf_buffer.put(pms.v_n); mphf_buffer.put('\n');
mphf_buffer.put(pms.v_b); mphf_buffer.put('\n');
mphf_buffer.put(pms.v_p1); mphf_buffer.put('\n');
mphf_buffer.put(pms.v_p2); mphf_buffer.put('\n');
mphf_buffer.put(pms.v_r); mphf_buffer.put('\n');
mphf_buffer.put(pms.v_seed); mphf_buffer.put('\n');
mphf_buffer.put(g_array_bytes); mphf_buffer.put('\t');
mphf_buffer.put((char*)c_array, g_array_bytes); mphf_buffer.put('\n');
*/
ostringstream fout(mphf_buffer.get_base(), ios::out); ostringstream fout(mphf_buffer.get_base(), ios::out);
@@ -252,13 +242,7 @@ int write_spec(buckets& bs, params& pms, buffer& mphf_buffer)
fout << pms.v_b << "\n"; fout << pms.v_b << "\n";
fout << pms.v_p1 << "\n"; fout << pms.v_p1 << "\n";
fout << pms.v_p2 << "\n"; fout << pms.v_p2 << "\n";
/*
int new_v_r = pms.v_r; SET_BIT(new_v_r, 0x80000000);
fout << new_v_r << "\n";
*/
fout << pms.v_r << "\n"; fout << pms.v_r << "\n";
fout << pms.v_seed << "\n"; fout << pms.v_seed << "\n";
fout << g_array_bytes << '\t'; fout << g_array_bytes << '\t';
@@ -266,8 +250,9 @@ int write_spec(buckets& bs, params& pms, buffer& mphf_buffer)
fout << '\n'; fout << '\n';
mphf_buffer.set_content_sz(spec_bytes); int fout_len = fout.str().size();
memcpy(mphf_buffer.get_base(), fout.str().c_str(), spec_bytes); mphf_buffer.set_content_sz(fout_len);
memcpy(mphf_buffer.get_base(), fout.str().c_str(), fout_len);
delete c_array; delete c_array;

4
cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C
View File

@@ -217,9 +217,11 @@ _DtHelpCreatePrintArea(Widget parent,
Dimension width, Dimension width,
Dimension height) Dimension height)
{ {
extern AppPrintData * l_AppPrintData;
DtHelpDispAreaStruct * DisplayArea; DtHelpDispAreaStruct * DisplayArea;
#if 0 && defined(PRINTING_SUPPORTED)
extern AppPrintData * l_AppPrintData;
String string_resolution; String string_resolution;
#endif /* PRINTING_SUPPORTED */
int resolution = 0; int resolution = 0;
// get print resolution from default-printer-resolution // get print resolution from default-printer-resolution

4
cde/programs/dtinfo/dtinfo/src/Managers/GraphicsMgr.C
View File

@@ -103,9 +103,11 @@ GraphicsMgr::~GraphicsMgr ()
PixmapGraphic * PixmapGraphic *
GraphicsMgr::get_graphic (UAS_Pointer<Graphic> &gr) GraphicsMgr::get_graphic (UAS_Pointer<Graphic> &gr)
{ {
#if 0 && defined(PRINTING_SUPPORTED)
extern AppPrintData * l_AppPrintData; extern AppPrintData * l_AppPrintData;
int resolution = 0;
String string_resolution ; String string_resolution ;
#endif /* PRINTING_SUPPORTED */
int resolution = 0;
// if printing, get print resolution from default-printer-resolution // if printing, get print resolution from default-printer-resolution