From c469e20fe52db54be01533b0e4748fa011d1ddc4 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Thu, 29 Jan 2009 15:27:52 -0200 Subject: Janitor: Correct make distcheck Remove extra .gitignore in subdirectories Correct a sparse warning --- src/.gitignore | 6 ------ src/Makefile.am | 2 +- src/Xcomposite.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 src/.gitignore (limited to 'src') diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 799fc97..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -*.lo -*.la -Makefile -Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index f18cf12..a7d8269 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include +AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include lib_LTLIBRARIES = libXcomposite.la diff --git a/src/Xcomposite.c b/src/Xcomposite.c index 33b5727..b5637b0 100644 --- a/src/Xcomposite.c +++ b/src/Xcomposite.c @@ -133,7 +133,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo, UnlockDisplay (dpy); SyncHandle (); Xfree(info); - return 0; + return NULL; } info->major_version = rep.majorVersion; info->minor_version = rep.minorVersion; -- cgit v1.2.1