summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bar.c4
-rw-r--r--src/communications.c2
-rw-r--r--src/data.h2
-rw-r--r--src/globals.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/bar.c b/src/bar.c
index e04caeb..47ada2d 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -355,12 +355,12 @@ draw_string (rp_screen *s, char *msg, int mark_start, int mark_end)
for(i=0; i < strlen(msg); ++i)
{
- if (i == mark_start)
+ if (i == (size_t)mark_start)
{
style = STYLE_INVERSE;
update = 1;
}
- if (i == mark_end)
+ if (i == (size_t)mark_end)
{
style = STYLE_NORMAL;
update = 1;
diff --git a/src/communications.c b/src/communications.c
index b3e95f2..5f0cdc7 100644
--- a/src/communications.c
+++ b/src/communications.c
@@ -109,7 +109,7 @@ send_command (unsigned char interactive, unsigned char *cmd, int screen_num)
XSelectInput (dpy, w, PropertyChangeMask);
XChangeProperty (dpy, w, rp_command, XA_STRING,
- 8, PropModeReplace, sbuf_get(s), strlen ((char *)cmd) + 2);
+ 8, PropModeReplace, (unsigned char*)sbuf_get(s), strlen ((char *)cmd) + 2);
XChangeProperty (dpy, root,
rp_command_request, XA_WINDOW,
diff --git a/src/data.h b/src/data.h
index 806ece9..541ca9e 100644
--- a/src/data.h
+++ b/src/data.h
@@ -384,7 +384,7 @@ struct rp_frame_undo
typedef struct rp_xselection rp_xselection;
struct rp_xselection
{
- unsigned char *text;
+ char *text;
int len;
};
diff --git a/src/globals.c b/src/globals.c
index 7446bca..f056103 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -95,7 +95,7 @@ x_export_selection (void)
if (XGetSelectionOwner(dpy, XA_PRIMARY) != screens[0].key_window)
PRINT_ERROR(("can't get primary selection"));
XChangeProperty(dpy, screens[0].root, XA_CUT_BUFFER0, XA_STRING, 8,
- PropModeReplace, selection.text, selection.len);
+ PropModeReplace, (unsigned char*)selection.text, selection.len);
}
void
@@ -172,7 +172,7 @@ get_primary_selection(void)
continue;
/* Accumulate the data. FIXME: ct.value may not be NULL
terminated. */
- sbuf_nconcat (s, ct.value, ct.nitems);
+ sbuf_nconcat (s, (const char*)ct.value, ct.nitems);
XFree(ct.value);
}
return sbuf_free_struct (s);