Fix a few compile warnings.

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@299 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Matt Chapman 2003-01-30 11:20:30 +00:00
parent 90a283925e
commit 1e8a4d5279
3 changed files with 10 additions and 5 deletions

View File

@ -87,7 +87,7 @@ get_property_value(char *propname, long max_length,
Returns -1 on error
*/
static int
get_current_desktop()
get_current_desktop(void)
{
unsigned long nitems_return;
uint32 *prop_return;

View File

@ -198,7 +198,7 @@ xkeymap_read(char *mapname)
/* Automatically add uppercase key, with same modifiers
plus shift */
for (p = keyname; *p; p++)
*p = toupper(*p);
*p = toupper((int)*p);
MASK_ADD_BITS(modifiers, MapLeftShiftMask);
add_to_keymap(keyname, scancode, modifiers, mapname);
}
@ -220,7 +220,7 @@ xkeymap_init(void)
mapname_ptr = keymapname;
while (*mapname_ptr)
{
*mapname_ptr = tolower(*mapname_ptr);
*mapname_ptr = tolower((int)*mapname_ptr);
mapname_ptr++;
}

9
xwin.c
View File

@ -315,9 +315,14 @@ ui_init(void)
if ((width == 0) || (height == 0))
{
/* Fetch geometry from _NET_WORKAREA */
uint32 xpos, ypos;
uint32 x, y, cx, cy;
if (get_current_workarea(&xpos, &ypos, &width, &height) < 0)
if (get_current_workarea(&x, &y, &cx, &cy) == 0)
{
width = cx;
height = cy;
}
else
{
warning("Failed to get workarea: probably your window manager does not support extended hints\n");
width = 800;