[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2156: Un-remove jpeg macros from bug 3848.

Jeff Licquia licquia at linuxfoundation.org
Wed Sep 18 20:46:17 UTC 2013


------------------------------------------------------------
revno: 2156
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2013-09-18 15:46:17 -0500
message:
  Un-remove jpeg macros from bug 3848.
modified:
  headers/All/4.1/jpeglib.h.defs
  headers/All/5.0/jpeglib.h.defs
  headers/jpeglib.h
-------------- next part --------------
=== modified file 'headers/All/4.1/jpeglib.h.defs'
--- a/headers/All/4.1/jpeglib.h.defs	2013-09-10 19:42:09 +0000
+++ b/headers/All/4.1/jpeglib.h.defs	2013-09-18 20:46:17 +0000
@@ -47,8 +47,12 @@
 #define DCTSIZE	8
 #define JMSG_STR_PARM_MAX	80
 #define JPP(arglist)	arglist
+#define EXTERN(type)	extern type
 #define JDCT_FASTEST	JDCT_IFAST
 #define JDCT_DEFAULT	JDCT_ISLOW
+#define LOCAL(type)	static type
+#define METHODDEF(type)	static type
+#define GLOBAL(type)	type
 #define JMETHOD(type,methodname,arglist)	type (*methodname) arglist
 
 struct jpeg_decompress_struct {

=== modified file 'headers/All/5.0/jpeglib.h.defs'
--- a/headers/All/5.0/jpeglib.h.defs	2013-09-10 19:42:09 +0000
+++ b/headers/All/5.0/jpeglib.h.defs	2013-09-18 20:46:17 +0000
@@ -47,8 +47,12 @@
 #define DCTSIZE	8
 #define JMSG_STR_PARM_MAX	80
 #define JPP(arglist)	arglist
+#define EXTERN(type)	extern type
 #define JDCT_FASTEST	JDCT_IFAST
 #define JDCT_DEFAULT	JDCT_ISLOW
+#define LOCAL(type)	static type
+#define METHODDEF(type)	static type
+#define GLOBAL(type)	type
 #define JMETHOD(type,methodname,arglist)	type (*methodname) arglist
 
 struct jpeg_decompress_struct {

=== modified file 'headers/jpeglib.h'
--- a/headers/jpeglib.h	2013-09-10 19:42:09 +0000
+++ b/headers/jpeglib.h	2013-09-18 20:46:17 +0000
@@ -58,16 +58,13 @@
 #define DCTSIZE	8
 #define JMSG_STR_PARM_MAX	80
 #define JPP(arglist)	arglist
+#define EXTERN(type)	extern type
 #define JDCT_FASTEST	JDCT_IFAST
 #define JDCT_DEFAULT	JDCT_ISLOW
-#define JMETHOD(type,methodname,arglist)	type (*methodname) arglist
-#if __LSB_VERSION__ < 41
-#define EXTERN(type)	extern type
 #define LOCAL(type)	static type
 #define METHODDEF(type)	static type
 #define GLOBAL(type)	type
-#endif				/* __LSB_VERSION__ < 4.1 */
-
+#define JMETHOD(type,methodname,arglist)	type (*methodname) arglist
 
 
     typedef struct jpeg_common_struct *j_common_ptr;



More information about the lsb-messages mailing list