removed GLIBC 2.7 dependency, added bugfix for Kindle DX

hwhw · Mar 2, 2015 · 29734a2 · 29734a2
1 parent a2c2a0b
commit 29734a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ else
 STRIP?=strip
 ARCH=$(shell $(CC) -dumpmachine)
 endif
-CFLAGS?=""
+CFLAGS?="-D_GNU_SOURCE=1"
 
 VERSION=$(shell git describe HEAD)
 #VERSION=$(shell date +'%Y-%m-%d_%H-%m')
@@ -57,7 +57,7 @@ LIBVNCCLIENT_SOURCES=\
 	$(LIBVNCCLIENT_DIR)/tls_none.c \
 	$(LIBVNCCLIENT_DIR)/../common/minilzo.c
 
-LIBVNCCLIENT_CFLAGS=-fPIC -shared \
+LIBVNCCLIENT_CFLAGS=-D_GNU_SOURCE=1 -fPIC -shared \
 	-DLIBVNCSERVER_HAVE_LIBZ -DLIBVNCSERVER_HAVE_LIBJPEG \
 	-I$(LIBVNCCLIENT_DIR)/.. -I$(LIBVNCCLIENT_DIR)/../common/ -I$(LIBVNCCLIENT) \
 	-I$(ZLIB_DIR)/ -I$(LIBJPEG_DIR)/ \

diff --git a/ffi/framebuffer_linux.lua b/ffi/framebuffer_linux.lua
@@ -24,7 +24,7 @@ local function einkfb_update(fb, refreshtype, waveform_mode, x, y, w, h)
 		refarea[0].which_fx = ffi.C.fx_update_full
 	end
 
-	ioctl(fb.fd, ffi.C.FBIO_EINK_UPDATE_DISPLAY_AREA, refarea);
+	return ffi.C.ioctl(fb.fd, ffi.C.FBIO_EINK_UPDATE_DISPLAY_AREA, refarea);
 end
 
 local function mxc_new_update_marker()
@@ -78,7 +78,7 @@ local function mxc_update(fb, refarea, refreshtype, waveform_mode, x, y, w, h)
 	refarea[0].alt_buffer_data.alt_update_region.left = 0
 	refarea[0].alt_buffer_data.alt_update_region.width = 0
 	refarea[0].alt_buffer_data.alt_update_region.height = 0
-	ffi.C.ioctl(fb.fd, ffi.C.MXCFB_SEND_UPDATE, refarea)
+	return ffi.C.ioctl(fb.fd, ffi.C.MXCFB_SEND_UPDATE, refarea)
 end
 
 -- Kindle's MXCFB_WAIT_FOR_UPDATE_SUBMISSION == 0x40044637