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
|
--- a/image_utils.c
+++ b/image_utils.c
@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf
src->pub.bytes_in_buffer = bufsize;
}
-jmp_buf setjmp_buffer;
+static jmp_buf setjmp_buffer;
/* Don't exit on error like libjpeg likes to do */
static void
libjpeg_error_handler(j_common_ptr cinfo)
--- a/metadata.c
+++ b/metadata.c
@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
}
/* For libjpeg error handling */
-jmp_buf setjmp_buffer;
+static jmp_buf setjmp_buffer;
static void
libjpeg_error_handler(j_common_ptr cinfo)
{
--- a/tivo_utils.c
+++ b/tivo_utils.c
@@ -27,6 +27,7 @@
#include <sqlite3.h>
#include "tivo_utils.h"
+struct sqlite3PrngType sqlite3Prng;
/* This function based on byRequest */
char *
decodeString(char *string, int inplace)
--- a/tivo_utils.h
+++ b/tivo_utils.h
@@ -30,7 +30,9 @@ struct sqlite3PrngType {
unsigned char isInit; /* True if initialized */
unsigned char i, j; /* State variables */
unsigned char s[256]; /* State variables */
-} sqlite3Prng;
+};
+
+extern struct sqlite3PrngType sqlite3Prng;
char *
decodeString(char *string, int inplace);
|
GitWeb
