[Xcb-commit] xcb/util-cursor: 2 commits - COPYING cursor

[Michael Stapelberg]

 COPYING         |   23 +++++++++++++++++++++++
 cursor/cursor.h |    4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 73ea12734b8ecf520938620eedba1e87416a7132
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Sat Jul 13 08:19:18 2013 +0200

    add COPYING file

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..24829f0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,23 @@
+Copyright © 2013 Michael Stapelberg
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
commit c7eff39a5fb3552de57e52f737ea7ae59b1ef895
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Fri Jul 12 19:57:44 2013 +0200

    don’t define xcb_cursor_context_t twice (Thanks Thomas)
    
    This fixes a compilation problem on NetBSD

diff --git a/cursor/cursor.h b/cursor/cursor.h
index a69f025..7d8c76b 100644
--- a/cursor/cursor.h
+++ b/cursor/cursor.h
@@ -32,6 +32,8 @@
 #include <stdbool.h>
 #include <xcb/render.h>
 
+#include "xcb_cursor.h"
+
 enum {
     RM_XCURSOR_THEME = 0,
     RM_XCURSOR_SIZE,
@@ -61,7 +63,7 @@ typedef struct xcb_cursor_context_t {
     const char *path;
 
     bool render_present;
-} xcb_cursor_context_t;
+};
 
 /*
  * Cursor files start with a header.  The header