summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-02-02 13:58:34 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-02-02 13:58:34 -0200
commit245b7cffe78203eeb265ac73177ed258471cb227 (patch)
tree6ac48c0a15bd8d42ba435f1a8b830a0880a09c15 /include
parent2c0dc990a1ad96b71c95800d83378413eab63dbb (diff)
downloadxorg-lib-libXv-245b7cffe78203eeb265ac73177ed258471cb227.tar.gz
Janitor: make distcheck, compiler warnings, .gitignore.
Diffstat (limited to 'include')
-rw-r--r--include/.gitignore2
-rw-r--r--include/X11/.gitignore2
-rw-r--r--include/X11/extensions/.gitignore2
-rw-r--r--include/X11/extensions/Xvlib.h5
4 files changed, 1 insertions, 10 deletions
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/include/X11/.gitignore b/include/X11/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/X11/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/include/X11/extensions/.gitignore b/include/X11/extensions/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/X11/extensions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/include/X11/extensions/Xvlib.h b/include/X11/extensions/Xvlib.h
index 2fd26e5..b5474aa 100644
--- a/include/X11/extensions/Xvlib.h
+++ b/include/X11/extensions/Xvlib.h
@@ -55,6 +55,7 @@ SOFTWARE.
#include <X11/Xfuncproto.h>
#include <X11/extensions/Xv.h>
+#include <X11/extensions/XShm.h>
typedef struct {
int numerator;
@@ -366,8 +367,6 @@ extern int XvShmPutImage (
Bool send_event
);
-#ifdef _XSHM_H_
-
extern XvImage * XvShmCreateImage (
Display *display,
XvPortID port,
@@ -378,8 +377,6 @@ extern XvImage * XvShmCreateImage (
XShmSegmentInfo *shminfo
);
-#endif
-
_XFUNCPROTOEND