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

Tooltalk fixes for OpenBSD. This consists mainly of #ifdefs, casts and some small type nits.

Browse Source
This commit is contained in:
Pascal Stumpf
2012-08-10 14:07:06 +02:00
committed by Jon Trulson
parent 3d5a492038
commit 3b77d7c065
39 changed files with 129 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cde/lib/tt/lib/tttk/ttdesktop.C
View File

@@ -679,7 +679,7 @@ _ttdt_GSet_Geometry(
{
Tt_message msg = _ttDesktopMessageCreate( commission, theClass,
handler, op, _ttdt_Geometry_in_cb,
callback, clientdata );
(void *)callback, clientdata );
Tt_status status = tt_ptr_error( msg );
if (status != TT_OK) {
return msg;
@@ -814,7 +814,7 @@ ttdt_Set_Geometry_pat(
{
return _ttdt_pat( TTDT_SET_GEOMETRY, _ttdt_Geometry_out_cb,
category, commission,
callback, clientdata, register_it );
(void *)callback, clientdata, register_it );
}
Tt_pattern
@@ -828,7 +828,7 @@ ttdt_Get_Geometry_pat(
{
return _ttdt_pat( TTDT_GET_GEOMETRY, _ttdt_Geometry_out_cb,
category, commission,
callback, clientdata, register_it );
(void *)callback, clientdata, register_it );
}
static int
@@ -953,7 +953,7 @@ _ttdt_GSet_Iconified(
{
Tt_message msg = _ttDesktopMessageCreate( commission, theClass,
handler, op, _ttdt_Iconified_in_cb,
callback, clientdata );
(void *)callback, clientdata );
Tt_status status = tt_ptr_error( msg );
if (status != TT_OK) {
return msg;
@@ -1048,7 +1048,7 @@ ttdt_Set_Iconified_pat(
return _ttdt_pat( TTDT_SET_ICONIFIED, _ttdt_Iconified_out_cb,
category, commission,
callback, clientdata, register_it );
(void *)callback, clientdata, register_it );
}
Tt_pattern
@@ -1062,7 +1062,7 @@ ttdt_Get_Iconified_pat(
{
return _ttdt_pat( TTDT_GET_ICONIFIED, _ttdt_Iconified_out_cb,
category, commission,
callback, clientdata, register_it );
(void *)callback, clientdata, register_it );
}
//
@@ -1226,7 +1226,7 @@ _ttdt_GSet_XInfo(
{
Tt_message msg = _ttDesktopMessageCreate( commission, theClass,
handler, op, _ttdt_XInfo_in_cb,
callback, clientdata );
(void *)callback, clientdata );
Tt_status status = tt_ptr_error( msg );
if (status != TT_OK) {
return msg;
@@ -1345,7 +1345,7 @@ ttdt_Set_XInfo_pat(
{
return _ttdt_pat( TTDT_SET_XINFO, _ttdt_XInfo_out_cb,
category, commission,
callback, clientdata, register_it );
(void *)callback, clientdata, register_it );
}
Tt_pattern
@@ -1359,7 +1359,7 @@ ttdt_Get_XInfo_pat(
{
return _ttdt_pat( TTDT_GET_XINFO, _ttdt_XInfo_out_cb,
category, commission,
callback, clientdata, register_it );
(void *)callback, clientdata, register_it );
}
//
@@ -1501,7 +1501,7 @@ ttdt_Get_Locale(
}
Tt_message msg = _ttDtPMessageCreate( commission, TT_REQUEST,
TT_SESSION, handler,
TTDT_GET_LOCALE, _ttDtGetLocaleCB, clientCB,
TTDT_GET_LOCALE, _ttDtGetLocaleCB, (void *)clientCB,
clientData );
Tt_status status = tt_ptr_error( msg );
if (status != TT_OK) {
@@ -1614,7 +1614,7 @@ ttdt_Get_Situation(
Tt_message msg = _ttDtPMessageCreate( commission, TT_REQUEST,
TT_SESSION, _handler,
TTDT_GET_SITUATION, _ttDtGetSituationCB,
clientCB, clientData );
(void *)clientCB, clientData );
Tt_status status = tt_ptr_error( msg );
if (status != TT_OK) {
return msg;
@@ -1661,7 +1661,7 @@ _ttdt_posix_cb(
struct utsname names;
char buf[ SYS_NMLN ];
case TTDT_SET_LOCALE:
return _ttDtGetLocaleCB( msg, pat, _ttDtApplyLocale, 0 );
return _ttDtGetLocaleCB( msg, pat, (void *)_ttDtApplyLocale, 0 );
case TTDT_GET_LOCALE:
for (i = 0; i < numArgs/2; i++) {
categoryName = _tttk_message_arg_val( msg, 2 * i, 0 );

6
cde/lib/tt/lib/tttk/ttdtfile.C
View File

@@ -115,7 +115,7 @@ _ttDtFileJoinPat(
Tt_pattern pat = _ttDtPatternCreate( TT_OBSERVE, theScope,
theScope != TT_FILE, pathname,
TTDT_DELETED, _ttDtFileCB,
cb, clientData, 0 );
(void *)cb, clientData, 0 );
Tt_status status = tt_ptr_error( pat );
if (status != TT_OK) {
return pat;
@@ -254,7 +254,7 @@ ttdt_file_request(
)
{
Tt_message msg = _ttDtPMessageCreate( context, TT_REQUEST, theScope, 0,
op, _ttDtFileCB, cb, clientData);
op, _ttDtFileCB, (void *)cb, clientData);
Tt_status status = tt_ptr_error( msg );
if (status != TT_OK) {
return msg;
@@ -298,7 +298,7 @@ _ttDtFileEventPat(
Tt_pattern pat = _ttDtPatternCreate( TT_HANDLE, theScope,
theScope != TT_FILE, pathname,
TTDT_SAVE, _ttDtFileCB,
cb, clientData, 0 );
(void *)cb, clientData, 0 );
Tt_status status = tt_ptr_error( pat );
if (status != TT_OK) {
return pat;

12
cde/lib/tt/lib/tttk/ttdtprocid.C
View File

@@ -102,7 +102,7 @@ pats_create(
pats[++i] = ttdt_Set_XInfo_pat( TT_HANDLE, contract,
_ttdt_do_Set_XInfo, shell, 1 );
pats[++i] = _ttdt_pat(TTDT_RAISE, _ttdt_contract_cb, TT_HANDLE,
contract, _ttdt_do_RaiseLower, shell, 0 );
contract, (void *)_ttdt_do_RaiseLower, shell, 0 );
tt_pattern_op_add( pats[i], _ttDtOp( TTDT_LOWER ) );
tt_pattern_session_add( pats[i], sess );
tt_pattern_register( pats[i] );
@@ -126,7 +126,7 @@ pats_create(
pats[++i] = ttdt_Set_XInfo_pat( TT_HANDLE, contract,
(Ttdt_XInfo_in_cb)cb, clientData, 1 );
pats[++i] = _ttdt_pat(TTDT_RAISE, _ttdt_contract_cb, TT_HANDLE,
contract, cb, clientData, 0 );
contract, (void *)cb, clientData, 0 );
tt_pattern_op_add( pats[i], _ttDtOp( TTDT_LOWER ) );
tt_pattern_session_add( pats[i], sess );
tt_pattern_register( pats[i] );
@@ -145,17 +145,17 @@ pats_create(
}
}
pats[++i] = _ttdt_pat( TTDT_QUIT, _ttdt_contract_cb, TT_HANDLE,
contract, cb, _clientData, 1 );
contract, (void *)cb, _clientData, 1 );
pats[++i] = _ttdt_pat( TTDT_PAUSE, _ttdt_contract_cb, TT_HANDLE,
contract, cb, (cb ? clientData : shell), 0 );
contract, (void *)cb, (cb ? clientData : shell), 0 );
tt_pattern_op_add( pats[i], _ttDtOp( TTDT_RESUME ));
tt_pattern_session_add( pats[i], sess );
tt_pattern_register( pats[i] );
pats[++i] = _ttdt_pat( TTDT_GET_STATUS, _ttdt_contract_cb, TT_HANDLE,
contract, cb, clientData, 1 );
contract, (void *)cb, clientData, 1 );
if (contract == 0) {
pats[++i]= _ttdt_pat( TTDT_DO_COMMAND, _ttdt_contract_cb,
TT_HANDLE, contract, cb, clientData, 1 );
TT_HANDLE, contract, (void *)cb, clientData, 1 );
pats[++i]= _ttdt_pat( TTDT_SET_LOCALE, _ttdt_posix_cb,
TT_HANDLE, contract, 0, 0, 0 );
tt_pattern_op_add( pats[i], _ttDtOp( TTDT_GET_LOCALE ));

4
cde/lib/tt/lib/tttk/ttmedia.C
View File

@@ -381,7 +381,7 @@ ttmedia_Deposit_pat(
{
Tt_pattern pat = _ttDtPatternCreate( category, TT_SESSION,
register_it, 0, TTME_DEPOSIT,
_ttMediaLoadMsgCB, clientcb,
_ttMediaLoadMsgCB, (void *)clientcb,
clientdata, 0 );
Tt_status status = tt_ptr_error( pat );
if (status != TT_OK) {
@@ -418,7 +418,7 @@ ttmedia_load(
)
{
Tt_message msg = _ttDtPMessageCreate( context, TT_REQUEST, TT_SESSION,
0, op, _ttMediaLoadMsgCB, cb, clientData );
0, op, _ttMediaLoadMsgCB, (void *)cb, clientData );
Tt_status status = tt_ptr_error( msg );
if (status != TT_OK) {
return msg;

2
cde/lib/tt/lib/tttk/tttk.C
View File

@@ -365,7 +365,7 @@ ttdt_subcontract_manage(
(Ttdt_XInfo_out_cb)cb, clientData, 1 );
}
pats[2] = _ttdt_pat( TTDT_STATUS, _ttdt_contract_cb, TT_OBSERVE,
subcontract, cb, clientData, 1 );
subcontract, (void *)cb, clientData, 1 );
pats[ numPats - 1 ] = 0;
for (int i = 0; i < numPats; i++) {
Tt_status status = tt_ptr_error( pats[ i ] );

2
cde/lib/tt/lib/tttk/tttkmessage.C
View File

@@ -169,7 +169,7 @@ _ttDtPMessageCreate(
return msg;
}
_TttkItem2Free fuse( msg );
status = tt_message_user_set( msg, _TttkCBKey, cb );
status = tt_message_user_set( msg, _TttkCBKey, (void *)cb );
if (status != TT_OK) {
return (Tt_message)tt_error_pointer( status );
}

2
cde/lib/tt/lib/tttk/tttkpattern.C
View File

@@ -161,7 +161,7 @@ _ttDtPatternCreate(
if (status != TT_OK) {
return (Tt_pattern)tt_error_pointer( status );
}
status = tt_pattern_user_set( pat, _TttkCBKey, cb );
status = tt_pattern_user_set( pat, _TttkCBKey, (void *)cb );
if (status != TT_OK) {
return (Tt_pattern)tt_error_pointer( status );
}