forked from pool/emacs
Autobuild autoformatter for 50939
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=57
This commit is contained in:
parent
0cfcdbbbad
commit
db23cf30c0
@ -1,27 +0,0 @@
|
|||||||
2009-10-23 Jim Meyering <meyering@redhat.com>
|
|
||||||
|
|
||||||
* configure.in: Invoke $CPP with -P when creating Makefile and
|
|
||||||
src/Makefile. Without this, gcc 4.4.2 converts each
|
|
||||||
backslash-newline pair in the input to a bare newline, yielding
|
|
||||||
invalid Makefiles.
|
|
||||||
|
|
||||||
--- emacs-23.1.orig/configure.in 2010-02-24 18:49:14.000000000 +0100
|
|
||||||
+++ emacs-23.1/configure.in 2010-02-24 18:51:16.000000000 +0100
|
|
||||||
@@ -2984,7 +2984,7 @@ echo creating lib-src/Makefile
|
|
||||||
sed -e '1,/start of cpp stuff/d'\
|
|
||||||
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
|
|
||||||
< Makefile.c > junk.c
|
|
||||||
- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
|
|
||||||
+ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
|
|
||||||
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
|
|
||||||
cat junk1.c junk2.c > Makefile.new
|
|
||||||
rm -f junk.c junk1.c junk2.c
|
|
||||||
@@ -3000,7 +3000,7 @@ echo creating src/Makefile
|
|
||||||
sed -e '1,/start of cpp stuff/d'\
|
|
||||||
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
|
|
||||||
< Makefile.c > junk.c
|
|
||||||
- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
|
|
||||||
+ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
|
|
||||||
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
|
|
||||||
cat junk1.c junk2.c > Makefile.new
|
|
||||||
rm -f junk.c junk1.c junk2.c
|
|
@ -1,47 +0,0 @@
|
|||||||
--- src/image.c
|
|
||||||
+++ src/image.c
|
|
||||||
@@ -5793,7 +5793,7 @@
|
|
||||||
/* PNG library details. */
|
|
||||||
|
|
||||||
DEF_IMGLIB_FN (png_get_io_ptr);
|
|
||||||
-DEF_IMGLIB_FN (png_check_sig);
|
|
||||||
+DEF_IMGLIB_FN (png_sig_cmp);
|
|
||||||
DEF_IMGLIB_FN (png_create_read_struct);
|
|
||||||
DEF_IMGLIB_FN (png_create_info_struct);
|
|
||||||
DEF_IMGLIB_FN (png_destroy_read_struct);
|
|
||||||
@@ -5824,7 +5824,7 @@
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
LOAD_IMGLIB_FN (library, png_get_io_ptr);
|
|
||||||
- LOAD_IMGLIB_FN (library, png_check_sig);
|
|
||||||
+ LOAD_IMGLIB_FN (library, png_sig_cmp);
|
|
||||||
LOAD_IMGLIB_FN (library, png_create_read_struct);
|
|
||||||
LOAD_IMGLIB_FN (library, png_create_info_struct);
|
|
||||||
LOAD_IMGLIB_FN (library, png_destroy_read_struct);
|
|
||||||
@@ -5849,7 +5849,7 @@
|
|
||||||
#else
|
|
||||||
|
|
||||||
#define fn_png_get_io_ptr png_get_io_ptr
|
|
||||||
-#define fn_png_check_sig png_check_sig
|
|
||||||
+#define fn_png_sig_cmp png_sig_cmp
|
|
||||||
#define fn_png_create_read_struct png_create_read_struct
|
|
||||||
#define fn_png_create_info_struct png_create_info_struct
|
|
||||||
#define fn_png_destroy_read_struct png_destroy_read_struct
|
|
||||||
@@ -5996,7 +5996,7 @@
|
|
||||||
|
|
||||||
/* Check PNG signature. */
|
|
||||||
if (fread (sig, 1, sizeof sig, fp) != sizeof sig
|
|
||||||
- || !fn_png_check_sig (sig, sizeof sig))
|
|
||||||
+ || fn_png_sig_cmp (sig, 0, sizeof sig))
|
|
||||||
{
|
|
||||||
image_error ("Not a PNG file: `%s'", file, Qnil);
|
|
||||||
UNGCPRO;
|
|
||||||
@@ -6013,7 +6013,7 @@
|
|
||||||
|
|
||||||
/* Check PNG signature. */
|
|
||||||
if (tbr.len < sizeof sig
|
|
||||||
- || !fn_png_check_sig (tbr.bytes, sizeof sig))
|
|
||||||
+ || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
|
|
||||||
{
|
|
||||||
image_error ("Not a PNG image: `%s'", img->spec, Qnil);
|
|
||||||
UNGCPRO;
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:435db5a28ff0b48b6e3c81dad7104ed21c563b76565666d98bbc8fe0afd14332
|
|
||||||
size 1048576
|
|
Loading…
x
Reference in New Issue
Block a user