From 5370b3405086408d363e14b4ff10ba38e1b5e2b4 Mon Sep 17 00:00:00 2001 From: nls Date: Sat, 19 Mar 2011 10:14:12 +0000 Subject: [PATCH] FS#12014 by Huan Zhang fixing some link errors with a recent mips toolchain. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29615 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libmusepack/requant.h | 6 +++--- apps/plugins/fft/const.h | 20 ++++++++++---------- apps/plugins/goban/display.h | 4 ++-- apps/plugins/rockboy/cpu.c | 2 +- apps/plugins/rockboy/rockmacros.h | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/codecs/libmusepack/requant.h b/apps/codecs/libmusepack/requant.h index 8458d4d0f..908fda30e 100644 --- a/apps/codecs/libmusepack/requant.h +++ b/apps/codecs/libmusepack/requant.h @@ -47,9 +47,9 @@ extern "C" { /* C O N S T A N T S */ -const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer -const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients -const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset +extern const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer +extern const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients +extern const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset #define Cc (__Cc + 1) #define Dc (__Dc + 1) diff --git a/apps/plugins/fft/const.h b/apps/plugins/fft/const.h index c6842f4c0..865f4b0f7 100644 --- a/apps/plugins/fft/const.h +++ b/apps/plugins/fft/const.h @@ -1,11 +1,11 @@ -const int16_t hamming_8192[8192]; -const int16_t hamming_4096[4096]; -const int16_t hamming_2048[2048]; -const int16_t hamming_1024[1024]; -const int16_t hamming_512[512]; -const int16_t hann_8192[8192]; -const int16_t hann_4096[4096]; -const int16_t hann_2048[2048]; -const int16_t hann_1024[1024]; -const int16_t hann_512[512]; +extern const int16_t hamming_8192[8192]; +extern const int16_t hamming_4096[4096]; +extern const int16_t hamming_2048[2048]; +extern const int16_t hamming_1024[1024]; +extern const int16_t hamming_512[512]; +extern const int16_t hann_8192[8192]; +extern const int16_t hann_4096[4096]; +extern const int16_t hann_2048[2048]; +extern const int16_t hann_1024[1024]; +extern const int16_t hann_512[512]; diff --git a/apps/plugins/goban/display.h b/apps/plugins/goban/display.h index 2f64f1b6c..c6b03a2af 100644 --- a/apps/plugins/goban/display.h +++ b/apps/plugins/goban/display.h @@ -38,10 +38,10 @@ extern unsigned short cursor_pos; extern bool draw_variations; /* Used to set the zoom level, loaded in from the config file */ -unsigned int saved_circle_size; +extern unsigned int saved_circle_size; /* the size of one intersection on the board, in pixels */ -unsigned int intersection_size; +extern unsigned int intersection_size; /* Clear the marks from the board */ void clear_marks_display (void); diff --git a/apps/plugins/rockboy/cpu.c b/apps/plugins/rockboy/cpu.c index e1d1324c4..392dd49b5 100644 --- a/apps/plugins/rockboy/cpu.c +++ b/apps/plugins/rockboy/cpu.c @@ -15,7 +15,7 @@ struct cpu cpu IBSS_ATTR; - +bool plugbuf; #define ZFLAG(n) ( (n) ? 0 : FZ ) diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h index 4a6822d41..724a0fb96 100644 --- a/apps/plugins/rockboy/rockmacros.h +++ b/apps/plugins/rockboy/rockmacros.h @@ -97,7 +97,7 @@ struct options { int dirty; }; -bool plugbuf; +extern bool plugbuf; extern struct options options; #define savedir ROCKBOX_DIR "/rockboy" -- 2.11.4.GIT