koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove compatibility definitions for xcb-util < 0.3.8 (#2473)

Browse Source 
Even Debian oldstable has xcb-util 0.3.8.
This commit is contained in:
Michael Stapelberg
2016-09-24 09:48:32 -07:00
committed by GitHub
parent 14f49aa6d3
commit 9bf346c7a0
13 changed files with 16 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
i3bar/i3bar.mk
View File

@ -12,7 +12,7 @@ i3bar_OBJECTS := $(i3bar_SOURCES:.c=.o)
i3bar/src/%.o: i3bar/src/%.c $(i3bar_HEADERS)
echo "[i3bar] CC $<"
$(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3bar_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -Ii3bar/include -c -o $@ $<
$(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3bar_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -Ii3bar/include -c -o $@ $<
i3bar/i3bar: libi3.a $(i3bar_OBJECTS)
echo "[i3bar] Link i3bar"

4
i3bar/include/xcb.h
View File

@ -12,10 +12,6 @@
#include <stdint.h>
//#include "outputs.h"
#ifdef XCB_COMPAT
#define XCB_ATOM_CARDINAL CARDINAL
#endif
#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
#define _NET_SYSTEM_TRAY_ORIENTATION_VERT 1
#define SYSTEM_TRAY_REQUEST_DOCK 0

4
i3bar/src/xcb.c
View File

@ -13,10 +13,6 @@
#include <xcb/xcb_aux.h>
#include <xcb/xcb_cursor.h>
#ifdef XCB_COMPAT
#include "xcb_compat.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>