summaryrefslogtreecommitdiff
path: root/lib/libXcursor/include
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-03-10 13:53:29 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-03-10 13:53:29 +0000
commitd21da6df5098e18cc8bb436acc89d2262a157fb7 (patch)
treebbeb36a0273c2a6641533a8c1b53316ad2e0441c /lib/libXcursor/include
parente269829efe9831e4d828da7862b1c5312c7a0a2e (diff)
upate to libXcursor 1.1.13
Diffstat (limited to 'lib/libXcursor/include')
-rw-r--r--lib/libXcursor/include/X11/Xcursor/Xcursor.h.in (renamed from lib/libXcursor/include/X11/Xcursor/Xcursor.h)29
1 files changed, 13 insertions, 16 deletions
diff --git a/lib/libXcursor/include/X11/Xcursor/Xcursor.h b/lib/libXcursor/include/X11/Xcursor/Xcursor.h.in
index cac21c981..1a1438634 100644
--- a/lib/libXcursor/include/X11/Xcursor/Xcursor.h
+++ b/lib/libXcursor/include/X11/Xcursor/Xcursor.h.in
@@ -1,6 +1,4 @@
/*
- * $Id: Xcursor.h,v 1.1 2006/11/25 17:00:29 matthieu Exp $
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -71,14 +69,13 @@ typedef XcursorUInt XcursorPixel;
#define XCURSOR_MAGIC 0x72756358 /* "Xcur" LSBFirst */
/*
- * Current Xcursor version number. This same number
- * must appear in the Xcursor configure.ac file. Yes,
- * it'a a pain to synchronize version numbers like this.
+ * Current Xcursor version number. Will be substituted by configure
+ * from the version in the libXcursor configure.ac file.
*/
-#define XCURSOR_LIB_MAJOR 1
-#define XCURSOR_LIB_MINOR 1
-#define XCURSOR_LIB_REVISION 7
+#undef XCURSOR_LIB_MAJOR
+#undef XCURSOR_LIB_MINOR
+#undef XCURSOR_LIB_REVISION
#define XCURSOR_LIB_VERSION ((XCURSOR_LIB_MAJOR * 10000) + \
(XCURSOR_LIB_MINOR * 100) + \
(XCURSOR_LIB_REVISION))
@@ -241,7 +238,7 @@ void
XcursorImageDestroy (XcursorImage *image);
/*
- * Manage Images objects
+ * Manage Images objects
*/
XcursorImages *
XcursorImagesCreate (int size);
@@ -306,7 +303,7 @@ XcursorXcFileLoad (XcursorFile *file,
XcursorImages **imagesp);
XcursorBool
-XcursorXcFileSave (XcursorFile *file,
+XcursorXcFileSave (XcursorFile *file,
const XcursorComments *comments,
const XcursorImages *images);
@@ -323,15 +320,15 @@ XcursorImages *
XcursorFileLoadAllImages (FILE *file);
XcursorBool
-XcursorFileLoad (FILE *file,
- XcursorComments **commentsp,
+XcursorFileLoad (FILE *file,
+ XcursorComments **commentsp,
XcursorImages **imagesp);
XcursorBool
XcursorFileSaveImages (FILE *file, const XcursorImages *images);
XcursorBool
-XcursorFileSave (FILE * file,
+XcursorFileSave (FILE * file,
const XcursorComments *comments,
const XcursorImages *images);
@@ -356,7 +353,7 @@ XcursorBool
XcursorFilenameSaveImages (const char *filename, const XcursorImages *images);
XcursorBool
-XcursorFilenameSave (const char *file,
+XcursorFilenameSave (const char *file,
const XcursorComments *comments,
const XcursorImages *images);
@@ -378,7 +375,7 @@ XcursorLibraryPath (void);
int
XcursorLibraryShape (const char *library);
-
+
/*
* Image/Cursor APIs
*/
@@ -467,7 +464,7 @@ XcursorTryShapeBitmapCursor (Display *dpy,
#define XCURSOR_BITMAP_HASH_SIZE 16
void
-XcursorImageHash (XImage *image,
+XcursorImageHash (XImage *image,
unsigned char hash[XCURSOR_BITMAP_HASH_SIZE]);
/*