summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2013-07-08 12:46:31 -0700
committerJay Sorg <jay.sorg@gmail.com>2013-07-08 12:46:31 -0700
commit110edd31c81f7e41365aecd82ce96f2b9a0fcf77 (patch)
tree640766fd38806b50173b3270d6461c46d2920d43
parent45492057c59cc774ed03b9dfe11a440a1fdf2bb3 (diff)
downloadxrdp-proprietary-110edd31c81f7e41365aecd82ce96f2b9a0fcf77.tar.gz
xrdp-proprietary-110edd31c81f7e41365aecd82ce96f2b9a0fcf77.zip
fix Makefile error, fix for warnings
-rw-r--r--tests/memtest/libmem.c2
-rw-r--r--xorg/X11R7.6/rdp/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/memtest/libmem.c b/tests/memtest/libmem.c
index 54744f1c..2fa0dea7 100644
--- a/tests/memtest/libmem.c
+++ b/tests/memtest/libmem.c
@@ -389,6 +389,7 @@ libmem_set_flags(void* obj, int flags)
self = (struct mem_info*)obj;
self->flags |= flags;
+ return 0;
}
/*****************************************************************************/
@@ -399,4 +400,5 @@ libmem_clear_flags(void* obj, int flags)
self = (struct mem_info*)obj;
self->flags &= ~flags;
+ return 0;
}
diff --git a/xorg/X11R7.6/rdp/Makefile b/xorg/X11R7.6/rdp/Makefile
index 755af882..e40b7473 100644
--- a/xorg/X11R7.6/rdp/Makefile
+++ b/xorg/X11R7.6/rdp/Makefile
@@ -112,4 +112,4 @@ fbcmap_mi.o: ../build_dir/xorg-server-1.9.3/fb/fbcmap_mi.c
$(CC) $(CFLAGS) -c ../build_dir/xorg-server-1.9.3/fb/fbcmap_mi.c
install: all
- $(INSTALL) X11rdp $(X11RDPBASE)/bin/X11rdp
+ $(INSTALL) X11rdp $(X11RDPBASE)/bin/X11rdp