nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings, update DEPENDS, update Makefile for NetBSD

This commit is contained in:
Michael Stapelberg 2009-03-08 17:30:17 +01:00
parent b51604bde6
commit f85990b27a
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DEPENDS
View File

@ -6,6 +6,7 @@ In that case, please try using the versions mentioned below until a fix is provi
* libxcb-1.1.93 (2008-12-11)
* xcb-util-0.3.3 (2009-01-31)
* Xlib, the one that comes with your X-Server
* asciidoc >= 8.3.0 for docs/hacking-howto
Get the libraries from:
http://xcb.freedesktop.org/dist/xcb-proto-1.3.tar.bz2

2
Makefile
View File

@ -16,7 +16,7 @@ LDFLAGS += -lX11
LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
ifeq ($(UNAME),NetBSD)
CFLAGS += -I/usr/pkg/include
LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
LDFLAGS += -liconv -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
endif
ifeq ($(UNAME),Linux)

2
include/util.h
View File

@ -34,7 +34,7 @@ void *scalloc(size_t size);
char *sstrdup(const char *str);
void start_application(const char *command);
void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_message);
char *convert_utf8_to_ucs2(char *input, int *real_strlen);
char *convert_utf8_to_ucs2(const char *input, int *real_strlen);
void remove_client_from_container(xcb_connection_t *conn, Client *client, Container *container);
void set_focus(xcb_connection_t *conn, Client *client);
void leave_stack_mode(xcb_connection_t *conn, Container *container);

2
src/handlers.c
View File

@ -486,7 +486,7 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
if (client->name != NULL)
free(client->name);
asprintf(&(client->name), "%.*s", xcb_get_property_value_length(prop), xcb_get_property_value(prop));
asprintf(&(client->name), "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop));
LOG("rename to \"%s\".\n", client->name);
if (client->container->mode == MODE_STACK)

2
src/util.c
View File

@ -145,7 +145,7 @@ void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_mes
* returned. It has to be freed when done.
*
*/
char *convert_utf8_to_ucs2(char *input, int *real_strlen) {
char *convert_utf8_to_ucs2(const char *input, int *real_strlen) {
size_t input_size = strlen(input) + 1;
/* UCS-2 consumes exactly two bytes for each glyph */
int buffer_size = input_size * 2;