1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
--- ace14/lib/xwin.c
+++ ace-1.4/lib/xwin.c
@@ -89,10 +89,10 @@
/* Motif window hints */
typedef struct
{
- unsigned flags;
- unsigned functions;
- unsigned decorations;
- int inputMode;
+ unsigned long flags;
+ unsigned long functions;
+ unsigned long decorations;
+ long inputMode;
} PropMotifWmHints;
typedef PropMotifWmHints PropMwmHints;
@@ -841,13 +841,13 @@
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
info_ptr = png_create_info_struct (png_ptr);
- if (setjmp (png_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf (png_ptr))) {
fprintf(stderr, "Invalid PNG image!\n");
return;
}
file_bytes = src->file_data;
- png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader);
+ png_set_read_fn (png_ptr, (void *)&file_bytes, (png_rw_ptr)png_reader);
png_read_info (png_ptr, info_ptr);
--- ace14/lib/make-imglib.c
+++ ace-1.4/lib/make-imglib.c
@@ -86,7 +86,7 @@
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
info_ptr = png_create_info_struct (png_ptr);
- if (setjmp (png_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf (png_ptr))) {
fclose (f);
continue;
}
--- ace14/lib/Makefile.am
+++ ace-1.4/lib/Makefile.am
@@ -6,7 +6,7 @@
CLEANFILES = images.c images.d
INCLUDES = $(X_CFLAGS) @PDA@
-AM_LDFLAGS = $(X_LIBS)
+AM_LDFLAGS = $(X_LIBS) -lpng -lz -lm
BUILD_CC = @BUILD_CC@
AR = @AR@
|
