diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-01-03 10:50:34 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-01-03 10:50:34 +0000 |
commit | 05778b501d7dfa0d6e55d779a577db9581774e2d (patch) | |
tree | eaf9d4e5eda0a9fc72eb82b1a262c0422e38e51b | |
parent | bfc129a5928072edb736b0a682b91bbaaf69f7f7 (diff) | |
download | rockbox-05778b501d7dfa0d6e55d779a577db9581774e2d.tar.gz rockbox-05778b501d7dfa0d6e55d779a577db9581774e2d.zip |
Fix further tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24156 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/skin_engine/skin_buffer.c | 2 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 76 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.h | 2 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_debug.c | 26 | ||||
-rw-r--r-- | apps/gui/statusbar.h | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-mr500.c | 2 | ||||
-rw-r--r-- | apps/metadata/rm.c | 4 | ||||
-rw-r--r-- | apps/recorder/pcm_record.c | 2 | ||||
-rw-r--r-- | firmware/bidi.c | 2 | ||||
-rw-r--r-- | firmware/font.c | 2 | ||||
-rw-r--r-- | firmware/kernel.c | 2 | ||||
-rw-r--r-- | firmware/sound.c | 2 |
14 files changed, 65 insertions, 65 deletions
diff --git a/apps/gui/skin_engine/skin_buffer.c b/apps/gui/skin_engine/skin_buffer.c index 3ad2efc634..eb33cbe293 100644 --- a/apps/gui/skin_engine/skin_buffer.c +++ b/apps/gui/skin_engine/skin_buffer.c | |||
@@ -66,7 +66,7 @@ | |||
66 | 66 | ||
67 | 67 | ||
68 | #define SKIN_BUFFER_SIZE (MAIN_BUFFER + REMOTE_BUFFER) + \ | 68 | #define SKIN_BUFFER_SIZE (MAIN_BUFFER + REMOTE_BUFFER) + \ |
69 | (WPS_MAX_TOKENS * sizeof(struct wps_token)) | 69 | (WPS_MAX_TOKENS * sizeof(struct wps_token)) |
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | #ifdef HAVE_LCD_CHARCELLS | 72 | #ifdef HAVE_LCD_CHARCELLS |
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 79690cb715..ea2c794272 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -229,11 +229,11 @@ static void wps_display_images(struct gui_wps *gwps, struct viewport* vp) | |||
229 | #ifdef HAVE_ALBUMART | 229 | #ifdef HAVE_ALBUMART |
230 | /* now draw the AA */ | 230 | /* now draw the AA */ |
231 | if (data->albumart && data->albumart->vp == vp | 231 | if (data->albumart && data->albumart->vp == vp |
232 | && data->albumart->draw) | 232 | && data->albumart->draw) |
233 | { | 233 | { |
234 | draw_album_art(gwps, playback_current_aa_hid(data->playback_aa_slot), | 234 | draw_album_art(gwps, playback_current_aa_hid(data->playback_aa_slot), |
235 | false); | 235 | false); |
236 | data->albumart->draw = false; | 236 | data->albumart->draw = false; |
237 | } | 237 | } |
238 | #endif | 238 | #endif |
239 | 239 | ||
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index eff972858d..794d7f4456 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -135,16 +135,16 @@ static char* get_dir(char* buf, int buf_size, const char* path, int level) | |||
135 | */ | 135 | */ |
136 | static int pitch_speed_enum(int range, int32_t val, int32_t normval) | 136 | static int pitch_speed_enum(int range, int32_t val, int32_t normval) |
137 | { | 137 | { |
138 | int center; | 138 | int center; |
139 | int n; | 139 | int n; |
140 | 140 | ||
141 | if (range < 3) | 141 | if (range < 3) |
142 | return (val == normval) + 1; | 142 | return (val == normval) + 1; |
143 | if (val == normval) | 143 | if (val == normval) |
144 | return range; | 144 | return range; |
145 | center = range / 2; | 145 | center = range / 2; |
146 | n = (center * val) / normval + 1; | 146 | n = (center * val) / normval + 1; |
147 | return (range <= n) ? (range - 1) : n; | 147 | return (range <= n) ? (range - 1) : n; |
148 | } | 148 | } |
149 | #endif | 149 | #endif |
150 | 150 | ||
@@ -415,8 +415,8 @@ const char *get_token_value(struct gui_wps *gwps, | |||
415 | case WPS_TOKEN_ALBUMART_DISPLAY: | 415 | case WPS_TOKEN_ALBUMART_DISPLAY: |
416 | if (!data->albumart) | 416 | if (!data->albumart) |
417 | return NULL; | 417 | return NULL; |
418 | if (!data->albumart->draw) | 418 | if (!data->albumart->draw) |
419 | data->albumart->draw = true; | 419 | data->albumart->draw = true; |
420 | return NULL; | 420 | return NULL; |
421 | #endif | 421 | #endif |
422 | 422 | ||
@@ -549,10 +549,10 @@ const char *get_token_value(struct gui_wps *gwps, | |||
549 | } | 549 | } |
550 | #endif | 550 | #endif |
551 | #ifdef HAVE_USB_POWER | 551 | #ifdef HAVE_USB_POWER |
552 | case WPS_TOKEN_USB_POWERED: | 552 | case WPS_TOKEN_USB_POWERED: |
553 | if (usb_powered()) | 553 | if (usb_powered()) |
554 | return "u"; | 554 | return "u"; |
555 | return NULL; | 555 | return NULL; |
556 | #endif | 556 | #endif |
557 | case WPS_TOKEN_BATTERY_SLEEPTIME: | 557 | case WPS_TOKEN_BATTERY_SLEEPTIME: |
558 | { | 558 | { |
@@ -836,32 +836,32 @@ const char *get_token_value(struct gui_wps *gwps, | |||
836 | int32_t pitch = sound_get_pitch(); | 836 | int32_t pitch = sound_get_pitch(); |
837 | snprintf(buf, buf_size, "%ld.%ld", | 837 | snprintf(buf, buf_size, "%ld.%ld", |
838 | pitch / PITCH_SPEED_PRECISION, | 838 | pitch / PITCH_SPEED_PRECISION, |
839 | (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); | 839 | (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); |
840 | 840 | ||
841 | if (intval) | 841 | if (intval) |
842 | *intval = pitch_speed_enum(limit, pitch, | 842 | *intval = pitch_speed_enum(limit, pitch, |
843 | PITCH_SPEED_PRECISION * 100); | 843 | PITCH_SPEED_PRECISION * 100); |
844 | return buf; | 844 | return buf; |
845 | } | 845 | } |
846 | #endif | 846 | #endif |
847 | 847 | ||
848 | #if CONFIG_CODEC == SWCODEC | 848 | #if CONFIG_CODEC == SWCODEC |
849 | case WPS_TOKEN_SOUND_SPEED: | 849 | case WPS_TOKEN_SOUND_SPEED: |
850 | { | 850 | { |
851 | int32_t pitch = sound_get_pitch(); | 851 | int32_t pitch = sound_get_pitch(); |
852 | int32_t speed; | 852 | int32_t speed; |
853 | if (dsp_timestretch_available()) | 853 | if (dsp_timestretch_available()) |
854 | speed = GET_SPEED(pitch, dsp_get_timestretch()); | 854 | speed = GET_SPEED(pitch, dsp_get_timestretch()); |
855 | else | 855 | else |
856 | speed = pitch; | 856 | speed = pitch; |
857 | snprintf(buf, buf_size, "%ld.%ld", | 857 | snprintf(buf, buf_size, "%ld.%ld", |
858 | speed / PITCH_SPEED_PRECISION, | 858 | speed / PITCH_SPEED_PRECISION, |
859 | (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); | 859 | (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); |
860 | if (intval) | 860 | if (intval) |
861 | *intval = pitch_speed_enum(limit, speed, | 861 | *intval = pitch_speed_enum(limit, speed, |
862 | PITCH_SPEED_PRECISION * 100); | 862 | PITCH_SPEED_PRECISION * 100); |
863 | return buf; | 863 | return buf; |
864 | } | 864 | } |
865 | #endif | 865 | #endif |
866 | 866 | ||
867 | case WPS_TOKEN_MAIN_HOLD: | 867 | case WPS_TOKEN_MAIN_HOLD: |
@@ -1122,7 +1122,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1122 | break; | 1122 | break; |
1123 | } | 1123 | } |
1124 | #endif | 1124 | #endif |
1125 | *intval = global_settings.mp3_enc_config.bitrate+1; | 1125 | *intval = global_settings.mp3_enc_config.bitrate+1; |
1126 | } | 1126 | } |
1127 | snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1); | 1127 | snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1); |
1128 | return buf; | 1128 | return buf; |
@@ -1136,9 +1136,9 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1136 | return buf; | 1136 | return buf; |
1137 | #endif | 1137 | #endif |
1138 | case WPS_TOKEN_REC_MONO: | 1138 | case WPS_TOKEN_REC_MONO: |
1139 | if (!global_settings.rec_channels) | 1139 | if (!global_settings.rec_channels) |
1140 | return "m"; | 1140 | return "m"; |
1141 | return NULL; | 1141 | return NULL; |
1142 | 1142 | ||
1143 | #endif /* HAVE_RECORDING */ | 1143 | #endif /* HAVE_RECORDING */ |
1144 | case WPS_TOKEN_CURRENT_SCREEN: | 1144 | case WPS_TOKEN_CURRENT_SCREEN: |
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h index 68a3fde944..481078bd6d 100644 --- a/apps/gui/skin_engine/skin_tokens.h +++ b/apps/gui/skin_engine/skin_tokens.h | |||
@@ -226,7 +226,7 @@ struct wps_token { | |||
226 | union { | 226 | union { |
227 | char c; | 227 | char c; |
228 | unsigned short i; | 228 | unsigned short i; |
229 | void* data; | 229 | void* data; |
230 | } value; | 230 | } value; |
231 | }; | 231 | }; |
232 | 232 | ||
diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c index 7232848005..e7277e847c 100644 --- a/apps/gui/skin_engine/wps_debug.c +++ b/apps/gui/skin_engine/wps_debug.c | |||
@@ -50,18 +50,18 @@ struct debug_token_table | |||
50 | #define X(name) name, #name | 50 | #define X(name) name, #name |
51 | struct debug_token_table tokens[] = { | 51 | struct debug_token_table tokens[] = { |
52 | { X(TOKEN_MARKER_CONTROL_TOKENS) }, | 52 | { X(TOKEN_MARKER_CONTROL_TOKENS) }, |
53 | { X(TOKEN_MARKER_BATTERY) }, | 53 | { X(TOKEN_MARKER_BATTERY) }, |
54 | { X(TOKEN_MARKER_SOUND) }, | 54 | { X(TOKEN_MARKER_SOUND) }, |
55 | { X(TOKEN_MARKER_RTC) }, | 55 | { X(TOKEN_MARKER_RTC) }, |
56 | { X(TOKEN_MARKER_DATABASE) }, | 56 | { X(TOKEN_MARKER_DATABASE) }, |
57 | { X(TOKEN_MARKER_FILE) }, | 57 | { X(TOKEN_MARKER_FILE) }, |
58 | { X(TOKEN_MARKER_IMAGES) }, | 58 | { X(TOKEN_MARKER_IMAGES) }, |
59 | { X(TOKEN_MARKER_METADATA) }, | 59 | { X(TOKEN_MARKER_METADATA) }, |
60 | { X(TOKEN_MARKER_PLAYBACK_INFO) }, | 60 | { X(TOKEN_MARKER_PLAYBACK_INFO) }, |
61 | { X(TOKEN_MARKER_PLAYLIST) }, | 61 | { X(TOKEN_MARKER_PLAYLIST) }, |
62 | { X(TOKEN_MARKER_MISC) }, | 62 | { X(TOKEN_MARKER_MISC) }, |
63 | { X(TOKEN_MARKER_RECORDING) }, | 63 | { X(TOKEN_MARKER_RECORDING) }, |
64 | { X(TOKEN_MARKER_END) }, | 64 | { X(TOKEN_MARKER_END) }, |
65 | }; | 65 | }; |
66 | #undef X | 66 | #undef X |
67 | 67 | ||
@@ -499,7 +499,7 @@ static char *get_token_desc(struct wps_token *token, char *buf, | |||
499 | if (token->type < tokens[i].start_marker) | 499 | if (token->type < tokens[i].start_marker) |
500 | { | 500 | { |
501 | snprintf(buf, bufsize, "FIXME: %s + %d\n", tokens[i-1].desc, | 501 | snprintf(buf, bufsize, "FIXME: %s + %d\n", tokens[i-1].desc, |
502 | token->type - tokens[i-1].start_marker); | 502 | token->type - tokens[i-1].start_marker); |
503 | break; | 503 | break; |
504 | } | 504 | } |
505 | } | 505 | } |
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index 28c81053e0..7c3086ed3b 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -70,7 +70,7 @@ struct gui_statusbar | |||
70 | struct status_info lastinfo; | 70 | struct status_info lastinfo; |
71 | #if CONFIG_RTC | 71 | #if CONFIG_RTC |
72 | struct tm *time; | 72 | struct tm *time; |
73 | int last_tm_min; | 73 | int last_tm_min; |
74 | #endif | 74 | #endif |
75 | struct screen * display; | 75 | struct screen * display; |
76 | }; | 76 | }; |
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 9b3323bb82..d49f95b66c 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -187,7 +187,7 @@ const struct button_mapping button_context_recscreen[] = { | |||
187 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 187 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
188 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 188 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
189 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 189 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
190 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 190 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
191 | 191 | ||
192 | LAST_ITEM_IN_LIST | 192 | LAST_ITEM_IN_LIST |
193 | }; /* button_context_recscreen */ | 193 | }; /* button_context_recscreen */ |
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c index 0b1dc767f2..11e1e60d61 100644 --- a/apps/keymaps/keymap-mr500.c +++ b/apps/keymaps/keymap-mr500.c | |||
@@ -56,7 +56,7 @@ static const struct button_mapping button_context_standard[] = { | |||
56 | }; /* button_context_standard */ | 56 | }; /* button_context_standard */ |
57 | 57 | ||
58 | static const struct button_mapping button_context_wps[] = { | 58 | static const struct button_mapping button_context_wps[] = { |
59 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | 59 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
60 | { ACTION_WPS_STOP, BUTTON_RC_DOWN|BUTTON_REL, BUTTON_RC_DOWN }, | 60 | { ACTION_WPS_STOP, BUTTON_RC_DOWN|BUTTON_REL, BUTTON_RC_DOWN }, |
61 | 61 | ||
62 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | 62 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, |
diff --git a/apps/metadata/rm.c b/apps/metadata/rm.c index 4b52c34d02..5740616042 100644 --- a/apps/metadata/rm.c +++ b/apps/metadata/rm.c | |||
@@ -379,7 +379,7 @@ static int rm_parse_header(int fd, RMContext *rmctx, struct mp3entry *id3) | |||
379 | read_uint32be(fd,&rmctx->nb_packets); | 379 | read_uint32be(fd,&rmctx->nb_packets); |
380 | skipped += 4; | 380 | skipped += 4; |
381 | read_uint32be(fd,&next_data_off); | 381 | read_uint32be(fd,&next_data_off); |
382 | skipped += 4; | 382 | skipped += 4; |
383 | 383 | ||
384 | /*** | 384 | /*** |
385 | * nb_packets correction : | 385 | * nb_packets correction : |
@@ -393,7 +393,7 @@ static int rm_parse_header(int fd, RMContext *rmctx, struct mp3entry *id3) | |||
393 | 393 | ||
394 | DEBUGF(" data_nb_packets = %ld\n",rmctx->nb_packets); | 394 | DEBUGF(" data_nb_packets = %ld\n",rmctx->nb_packets); |
395 | DEBUGF(" next DATA offset = %ld\n",next_data_off); | 395 | DEBUGF(" next DATA offset = %ld\n",next_data_off); |
396 | header_end = 1; | 396 | header_end = 1; |
397 | break; | 397 | break; |
398 | } | 398 | } |
399 | if(header_end) break; | 399 | if(header_end) break; |
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c index d1dc03113d..217d276669 100644 --- a/apps/recorder/pcm_record.c +++ b/apps/recorder/pcm_record.c | |||
@@ -368,7 +368,7 @@ void pcm_rec_init(void) | |||
368 | pcmrec_thread_id = | 368 | pcmrec_thread_id = |
369 | create_thread(pcmrec_thread, pcmrec_stack, sizeof(pcmrec_stack), | 369 | create_thread(pcmrec_thread, pcmrec_stack, sizeof(pcmrec_stack), |
370 | 0, pcmrec_thread_name IF_PRIO(, PRIORITY_RECORDING) | 370 | 0, pcmrec_thread_name IF_PRIO(, PRIORITY_RECORDING) |
371 | IF_COP(, CPU)); | 371 | IF_COP(, CPU)); |
372 | queue_enable_queue_send(&pcmrec_queue, &pcmrec_queue_send, | 372 | queue_enable_queue_send(&pcmrec_queue, &pcmrec_queue_send, |
373 | pcmrec_thread_id); | 373 | pcmrec_thread_id); |
374 | } /* pcm_rec_init */ | 374 | } /* pcm_rec_init */ |
diff --git a/firmware/bidi.c b/firmware/bidi.c index e6a4341f79..2f4e137956 100644 --- a/firmware/bidi.c +++ b/firmware/bidi.c | |||
@@ -159,7 +159,7 @@ unsigned short *bidi_l2v(const unsigned char *str, int orientation) | |||
159 | #ifdef BOOTLOADER | 159 | #ifdef BOOTLOADER |
160 | (void)orientation; | 160 | (void)orientation; |
161 | return utf16_buf; | 161 | return utf16_buf; |
162 | 162 | ||
163 | #else /* !BOOTLOADER */ | 163 | #else /* !BOOTLOADER */ |
164 | if (target == utf16_buf) /* empty string */ | 164 | if (target == utf16_buf) /* empty string */ |
165 | return target; | 165 | return target; |
diff --git a/firmware/font.c b/firmware/font.c index 858a312ac6..a8734e93a1 100644 --- a/firmware/font.c +++ b/firmware/font.c | |||
@@ -578,7 +578,7 @@ void font_init(void) | |||
578 | struct font* font_get(int font) | 578 | struct font* font_get(int font) |
579 | { | 579 | { |
580 | (void)font; | 580 | (void)font; |
581 | return &sysfont; | 581 | return &sysfont; |
582 | } | 582 | } |
583 | 583 | ||
584 | /* | 584 | /* |
diff --git a/firmware/kernel.c b/firmware/kernel.c index fbc5a2905c..29907f3082 100644 --- a/firmware/kernel.c +++ b/firmware/kernel.c | |||
@@ -260,7 +260,7 @@ void sleep(int ticks) | |||
260 | switch_thread(); | 260 | switch_thread(); |
261 | #elif defined(CREATIVE_ZVx) && defined(BOOTLOADER) | 261 | #elif defined(CREATIVE_ZVx) && defined(BOOTLOADER) |
262 | /* hacky.. */ | 262 | /* hacky.. */ |
263 | long sleep_ticks = current_tick + ticks + 1; | 263 | long sleep_ticks = current_tick + ticks + 1; |
264 | while (TIME_BEFORE(current_tick, sleep_ticks)) | 264 | while (TIME_BEFORE(current_tick, sleep_ticks)) |
265 | switch_thread(); | 265 | switch_thread(); |
266 | #else | 266 | #else |
diff --git a/firmware/sound.c b/firmware/sound.c index 7c97d9b63c..d66a93a70d 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -253,7 +253,7 @@ static void set_prescaled_volume(void) | |||
253 | || defined(HAVE_AK4537) || defined(HAVE_UDA1341) | 253 | || defined(HAVE_AK4537) || defined(HAVE_UDA1341) |
254 | audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r)); | 254 | audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r)); |
255 | #if defined(HAVE_WM8975) || defined(HAVE_WM8758) \ | 255 | #if defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
256 | || (defined(HAVE_WM8751) && !defined(MROBE_100)) || defined(HAVE_WM8985) | 256 | || (defined(HAVE_WM8751) && !defined(MROBE_100)) || defined(HAVE_WM8985) |
257 | audiohw_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); | 257 | audiohw_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); |
258 | #endif | 258 | #endif |
259 | 259 | ||