[patch] asm-types confusion
David Juran <[email protected]>
| Newsgroups | gmane.comp.video.transcode.devel |
|---|---|
| Message-ID | <[email protected]> |
Hello. When building transcode for Fedora devel I noticed that there is some confusion with asm-types in import/nuv/RTjpegN.h It seems it tries to define some types that really should come from asm/types.h and the include guard used is all wrong, especially on x86_64... The attached patch fixes the compilation issue and applies to the HEAD branch as well. -- David Juran Sr. Consultant Red Hat +358-504-146348
transcode-1.0.4-types.patch
(text/x-patch, 1.2 KB)
diff -up transcode-1.0.4/import/nuv/RTjpegN.c.types transcode-1.0.4/import/nuv/RTjpegN.c
diff -up transcode-1.0.4/import/nuv/RTjpegN.h.types transcode-1.0.4/import/nuv/RTjpegN.h
--- transcode-1.0.4/import/nuv/RTjpegN.h.types 2003-03-08 15:42:48.000000000 +0200
+++ transcode-1.0.4/import/nuv/RTjpegN.h 2007-12-09 22:01:05.000000000 +0200
@@ -22,19 +22,11 @@
*/
-#ifndef _I386_TYPES_H
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned long __u32;
-typedef unsigned long long __u64;
-typedef signed char __s8;
-typedef signed short __s16;
-typedef signed long __s32;
-#endif
+#include <asm/types.h>
extern void RTjpeg_init_Q(__u8 Q);
-extern void RTjpeg_init_compress(long unsigned int *buf, int width, int height, __u8 Q);
-extern void RTjpeg_init_decompress(long unsigned int *buf, int width, int height);
+extern void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q);
+extern void RTjpeg_init_decompress(__u32 *buf, int width, int height);
extern int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp);
extern int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp);
extern void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp);