From 0e964b833fbb4614fe3fae80ed89efa4d6169a38 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 2 May 2010 03:56:36 +0200 Subject: [PATCH] Fix some greedy sed changes in imported code. Also provide a sys/types.h for compatibility with imported code. --- apps/codecs/lib/codeclib_misc.h | 2 +- apps/codecs/libfaad/faad_config.h | 4 ++-- apps/codecs/libffmpegFLAC/main.c | 2 +- apps/codecs/libmad/decoder.c | 2 +- apps/codecs/libpcm/ima_adpcm_common.h | 1 - apps/codecs/libpcm/pcm_common.h | 1 - apps/codecs/libspeex/config-speex.h | 2 +- apps/codecs/libspeex/speex/speex_types.h | 4 ++-- apps/codecs/libtremor/misc.h | 2 +- apps/plugins/imageviewer/png/zconf.h | 2 +- apps/plugins/lua/malloc.c | 2 +- apps/plugins/lua/strftime.c | 2 +- apps/plugins/pdbox/PDa/extra/dumpOSC.c | 4 ++-- apps/plugins/pdbox/PDa/extra/sendOSC.c | 8 ++++---- apps/plugins/pdbox/PDa/extra/shell.c | 2 +- apps/plugins/pdbox/PDa/src/d_array.c | 4 ++-- apps/plugins/pdbox/PDa/src/d_osc.c | 4 ++-- apps/plugins/pdbox/PDa/src/d_soundfile.c | 2 +- apps/plugins/pdbox/PDa/src/s_audio_alsa.c | 2 +- apps/plugins/pdbox/PDa/src/s_audio_oss.c | 2 +- apps/plugins/pdbox/PDa/src/s_file.c | 2 +- apps/plugins/pdbox/PDa/src/s_inter.c | 2 +- apps/plugins/pdbox/PDa/src/s_main.c | 2 +- apps/plugins/pdbox/PDa/src/s_midi.c | 2 +- apps/plugins/pdbox/PDa/src/s_midi_oss.c | 2 +- apps/plugins/pdbox/PDa/src/s_midi_sgi.c | 2 +- apps/plugins/pdbox/PDa/src/s_watchdog.c | 2 +- apps/plugins/pdbox/PDa/src/t_tkcmd.c | 2 +- apps/plugins/pdbox/PDa/src/u_pdreceive.c | 2 +- apps/plugins/pdbox/PDa/src/u_pdsend.c | 2 +- apps/plugins/pdbox/PDa/src/x_misc.c | 2 +- apps/plugins/pdbox/PDa/src/x_net.c | 2 +- .../libc/include/sys/types.h | 17 ++++------------- 33 files changed, 42 insertions(+), 53 deletions(-) copy apps/codecs/libpcm/ima_adpcm_common.h => firmware/libc/include/sys/types.h (66%) diff --git a/apps/codecs/lib/codeclib_misc.h b/apps/codecs/lib/codeclib_misc.h index 6632e804e..0d560755d 100644 --- a/apps/codecs/lib/codeclib_misc.h +++ b/apps/codecs/lib/codeclib_misc.h @@ -40,7 +40,7 @@ #ifndef _LOW_ACCURACY_ /* 64 bit multiply */ -/* #include "inttypes.h" */ +/* #include */ #if ROCKBOX_LITTLE_ENDIAN == 1 union magic { diff --git a/apps/codecs/libfaad/faad_config.h b/apps/codecs/libfaad/faad_config.h index 31ffe9acf..163b55669 100644 --- a/apps/codecs/libfaad/faad_config.h +++ b/apps/codecs/libfaad/faad_config.h @@ -71,7 +71,7 @@ /* Define to 1 if you have the header file. */ //#define HAVE_SYS_TIME_H 1 -/* Define to 1 if you have the "inttypes.h" header file. */ +/* Define to 1 if you have the header file. */ //#define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ @@ -116,5 +116,5 @@ /* #undef inline */ #endif -/* Define to `long' if "inttypes.h" does not define. */ +/* Define to `long' if does not define. */ /* #undef off_t */ diff --git a/apps/codecs/libffmpegFLAC/main.c b/apps/codecs/libffmpegFLAC/main.c index 11e4e71fc..5d232a889 100644 --- a/apps/codecs/libffmpegFLAC/main.c +++ b/apps/codecs/libffmpegFLAC/main.c @@ -38,7 +38,7 @@ #include #include #include -#include "inttypes.h" +#include #include #include "decoder.h" diff --git a/apps/codecs/libmad/decoder.c b/apps/codecs/libmad/decoder.c index 8eb8c2d2a..46f4dfe5f 100644 --- a/apps/codecs/libmad/decoder.c +++ b/apps/codecs/libmad/decoder.c @@ -26,7 +26,7 @@ # include "global.h" # ifdef HAVE_SYS_TYPES_H -# include "inttypes.h" +# include # endif # ifdef HAVE_SYS_WAIT_H diff --git a/apps/codecs/libpcm/ima_adpcm_common.h b/apps/codecs/libpcm/ima_adpcm_common.h index a391e4df3..46fd6083e 100644 --- a/apps/codecs/libpcm/ima_adpcm_common.h +++ b/apps/codecs/libpcm/ima_adpcm_common.h @@ -21,7 +21,6 @@ #ifndef CODEC_LIBPCM_IMA_ADPCM_COMMON_H #define CODEC_LIBPCM_IMA_ADPCM_COMMON_H -#include "inttypes.h" #include #include diff --git a/apps/codecs/libpcm/pcm_common.h b/apps/codecs/libpcm/pcm_common.h index f21854f70..45b922afd 100644 --- a/apps/codecs/libpcm/pcm_common.h +++ b/apps/codecs/libpcm/pcm_common.h @@ -21,7 +21,6 @@ #ifndef CODEC_LIBPCM_PCM_COMMON_H #define CODEC_LIBPCM_PCM_COMMON_H -#include "inttypes.h" #include #include diff --git a/apps/codecs/libspeex/config-speex.h b/apps/codecs/libspeex/config-speex.h index f1b303a09..f3b397f54 100644 --- a/apps/codecs/libspeex/config-speex.h +++ b/apps/codecs/libspeex/config-speex.h @@ -97,7 +97,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define to 1 if you have the "inttypes.h" header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ diff --git a/apps/codecs/libspeex/speex/speex_types.h b/apps/codecs/libspeex/speex/speex_types.h index fe8fb726a..a2ff1d6b5 100644 --- a/apps/codecs/libspeex/speex/speex_types.h +++ b/apps/codecs/libspeex/speex/speex_types.h @@ -50,7 +50,7 @@ #elif defined(__MACOS__) -# include "inttypes.h" +# include typedef SInt16 spx_int16_t; typedef UInt16 spx_uint16_t; typedef SInt32 spx_int32_t; @@ -58,7 +58,7 @@ #elif defined(__MACOSX__) /* MacOS X Framework build */ -# include "inttypes.h" +# include typedef int16_t spx_int16_t; typedef u_int16_t spx_uint16_t; typedef int32_t spx_int32_t; diff --git a/apps/codecs/libtremor/misc.h b/apps/codecs/libtremor/misc.h index 2ea1d9e97..a64a95d13 100644 --- a/apps/codecs/libtremor/misc.h +++ b/apps/codecs/libtremor/misc.h @@ -36,7 +36,7 @@ extern int _ilog(unsigned int v); #ifndef _LOW_ACCURACY_ /* 64 bit multiply */ -/* #include "inttypes.h" */ +/* #include */ #if BYTE_ORDER==LITTLE_ENDIAN union magic { diff --git a/apps/plugins/imageviewer/png/zconf.h b/apps/plugins/imageviewer/png/zconf.h index b3ca88cd0..03a9431c8 100644 --- a/apps/plugins/imageviewer/png/zconf.h +++ b/apps/plugins/imageviewer/png/zconf.h @@ -285,7 +285,7 @@ typedef uLong FAR uLongf; #endif #if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ -# include "inttypes.h" /* for off_t */ +# include /* for off_t */ # include /* for SEEK_* and off_t */ # ifdef VMS # include /* for off_t */ diff --git a/apps/plugins/lua/malloc.c b/apps/plugins/lua/malloc.c index 87705869a..6dc00c4f9 100644 --- a/apps/plugins/lua/malloc.c +++ b/apps/plugins/lua/malloc.c @@ -468,7 +468,7 @@ DEFAULT_MMAP_THRESHOLD default: 256K #endif /* DARWIN */ #ifndef LACKS_SYS_TYPES_H -#include "inttypes.h" /* For size_t */ +#include /* For size_t */ #endif /* LACKS_SYS_TYPES_H */ /* The maximum possible size_t value has all bits set */ diff --git a/apps/plugins/lua/strftime.c b/apps/plugins/lua/strftime.c index feac0b9c0..681d4be1c 100644 --- a/apps/plugins/lua/strftime.c +++ b/apps/plugins/lua/strftime.c @@ -1,4 +1,4 @@ -#include "inttypes.h" +#include #include #include "plugin.h" diff --git a/apps/plugins/pdbox/PDa/extra/dumpOSC.c b/apps/plugins/pdbox/PDa/extra/dumpOSC.c index 3c1867c48..b4ef97d7d 100644 --- a/apps/plugins/pdbox/PDa/extra/dumpOSC.c +++ b/apps/plugins/pdbox/PDa/extra/dumpOSC.c @@ -88,7 +88,7 @@ void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr); #include #include #include - #include "inttypes.h" + #include #include #include #include @@ -98,7 +98,7 @@ void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr); #include #include #include - #include "inttypes.h" + #include #include #include #include diff --git a/apps/plugins/pdbox/PDa/extra/sendOSC.c b/apps/plugins/pdbox/PDa/extra/sendOSC.c index d9420aa5b..6bb809d68 100644 --- a/apps/plugins/pdbox/PDa/extra/sendOSC.c +++ b/apps/plugins/pdbox/PDa/extra/sendOSC.c @@ -51,11 +51,11 @@ The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl #include "OSC-client.h" #include -#include "inttypes.h" +#include #include #include #include -#include "inttypes.h" +#include #ifdef WIN32 #include @@ -1055,12 +1055,12 @@ void SendData(void *htmsocket, int size, char *data) { #include #include #include - #include "inttypes.h" + #include #include #endif #ifdef __APPLE__ - #include "inttypes.h" + #include #endif #ifdef unix diff --git a/apps/plugins/pdbox/PDa/extra/shell.c b/apps/plugins/pdbox/PDa/extra/shell.c index 861bf945e..8653c63ff 100644 --- a/apps/plugins/pdbox/PDa/extra/shell.c +++ b/apps/plugins/pdbox/PDa/extra/shell.c @@ -10,7 +10,7 @@ #include #include #include -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/d_array.c b/apps/plugins/pdbox/PDa/src/d_array.c index 8314e197d..7139e4dc3 100644 --- a/apps/plugins/pdbox/PDa/src/d_array.c +++ b/apps/plugins/pdbox/PDa/src/d_array.c @@ -516,7 +516,7 @@ static void tabread4_tilde_setup(void) #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* BYTE_ORDER */ -#include "inttypes.h" +#include #define int32 int32_t #endif @@ -534,7 +534,7 @@ static void tabread4_tilde_setup(void) #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* __BYTE_ORDER */ -#include "inttypes.h" +#include #define int32 int32_t #else diff --git a/apps/plugins/pdbox/PDa/src/d_osc.c b/apps/plugins/pdbox/PDa/src/d_osc.c index 7ee9caedf..35b43b82c 100644 --- a/apps/plugins/pdbox/PDa/src/d_osc.c +++ b/apps/plugins/pdbox/PDa/src/d_osc.c @@ -33,7 +33,7 @@ #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* BYTE_ORDER */ -#include "inttypes.h" +#include #define int32 int32_t #endif #ifdef __linux__ @@ -52,7 +52,7 @@ #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* __BYTE_ORDER */ -#include "inttypes.h" +#include #define int32 int32_t #else diff --git a/apps/plugins/pdbox/PDa/src/d_soundfile.c b/apps/plugins/pdbox/PDa/src/d_soundfile.c index 790bd46dc..67a80c9d3 100644 --- a/apps/plugins/pdbox/PDa/src/d_soundfile.c +++ b/apps/plugins/pdbox/PDa/src/d_soundfile.c @@ -1434,7 +1434,7 @@ static void pute(char *s) /* debug routine */ #define sfread_cond_signal pthread_cond_signal #else #include /* debugging version... */ -#include "inttypes.h" +#include static void readsf_fakewait(pthread_mutex_t *b) { struct timeval timout; diff --git a/apps/plugins/pdbox/PDa/src/s_audio_alsa.c b/apps/plugins/pdbox/PDa/src/s_audio_alsa.c index 8ff558409..b8e8535dc 100644 --- a/apps/plugins/pdbox/PDa/src/s_audio_alsa.c +++ b/apps/plugins/pdbox/PDa/src/s_audio_alsa.c @@ -14,7 +14,7 @@ #include #include #include -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/s_audio_oss.c b/apps/plugins/pdbox/PDa/src/s_audio_oss.c index fd863aed6..de11f6624 100644 --- a/apps/plugins/pdbox/PDa/src/s_audio_oss.c +++ b/apps/plugins/pdbox/PDa/src/s_audio_oss.c @@ -16,7 +16,7 @@ #include #include #include -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/s_file.c b/apps/plugins/pdbox/PDa/src/s_file.c index c7e70ca48..4995e8704 100644 --- a/apps/plugins/pdbox/PDa/src/s_file.c +++ b/apps/plugins/pdbox/PDa/src/s_file.c @@ -14,7 +14,7 @@ #else /* ROCKBOX */ #include "m_pd.h" #include "s_stuff.h" -#include "inttypes.h" +#include #include #endif /* ROCKBOX */ diff --git a/apps/plugins/pdbox/PDa/src/s_inter.c b/apps/plugins/pdbox/PDa/src/s_inter.c index 07e304a1f..9df9c82b4 100644 --- a/apps/plugins/pdbox/PDa/src/s_inter.c +++ b/apps/plugins/pdbox/PDa/src/s_inter.c @@ -37,7 +37,7 @@ typedef int pid_t; #include #ifdef MACOSX -#include "inttypes.h" +#include #include #include #else diff --git a/apps/plugins/pdbox/PDa/src/s_main.c b/apps/plugins/pdbox/PDa/src/s_main.c index 0b77b4476..b77f804e9 100644 --- a/apps/plugins/pdbox/PDa/src/s_main.c +++ b/apps/plugins/pdbox/PDa/src/s_main.c @@ -14,7 +14,7 @@ char pd_compiledate[] = __DATE__; #include "m_pd.h" #include "m_imp.h" #include "s_stuff.h" -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/s_midi.c b/apps/plugins/pdbox/PDa/src/s_midi.c index c24ba9ef6..72a8792b2 100644 --- a/apps/plugins/pdbox/PDa/src/s_midi.c +++ b/apps/plugins/pdbox/PDa/src/s_midi.c @@ -16,7 +16,7 @@ #endif #ifdef MSW #include -#include "inttypes.h" +#include #include #include #endif diff --git a/apps/plugins/pdbox/PDa/src/s_midi_oss.c b/apps/plugins/pdbox/PDa/src/s_midi_oss.c index c0353904a..fab1d84b6 100644 --- a/apps/plugins/pdbox/PDa/src/s_midi_oss.c +++ b/apps/plugins/pdbox/PDa/src/s_midi_oss.c @@ -10,7 +10,7 @@ #include #endif #include -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/s_midi_sgi.c b/apps/plugins/pdbox/PDa/src/s_midi_sgi.c index fcfd0c0fe..105a812b4 100644 --- a/apps/plugins/pdbox/PDa/src/s_midi_sgi.c +++ b/apps/plugins/pdbox/PDa/src/s_midi_sgi.c @@ -10,7 +10,7 @@ #ifdef HAVE_BSTRING_H #include #endif -#include "inttypes.h" +#include #include #include diff --git a/apps/plugins/pdbox/PDa/src/s_watchdog.c b/apps/plugins/pdbox/PDa/src/s_watchdog.c index 6a9060f7e..e8653e9e3 100644 --- a/apps/plugins/pdbox/PDa/src/s_watchdog.c +++ b/apps/plugins/pdbox/PDa/src/s_watchdog.c @@ -7,7 +7,7 @@ tries to prevent Pd from locking up the processor if it's at realtime priority. Linux only. Invoked from s_inter.c. */ #include -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/t_tkcmd.c b/apps/plugins/pdbox/PDa/src/t_tkcmd.c index 79a3270aa..ff12a2849 100644 --- a/apps/plugins/pdbox/PDa/src/t_tkcmd.c +++ b/apps/plugins/pdbox/PDa/src/t_tkcmd.c @@ -11,7 +11,7 @@ #include #include #include -#include "inttypes.h" +#include #ifdef UNIX #include #include diff --git a/apps/plugins/pdbox/PDa/src/u_pdreceive.c b/apps/plugins/pdbox/PDa/src/u_pdreceive.c index 204e20f91..51e60f7d5 100644 --- a/apps/plugins/pdbox/PDa/src/u_pdreceive.c +++ b/apps/plugins/pdbox/PDa/src/u_pdreceive.c @@ -6,7 +6,7 @@ from Pd via the netsend/netreceive ("FUDI") protocol, and copies them to standard output. */ -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/u_pdsend.c b/apps/plugins/pdbox/PDa/src/u_pdsend.c index cc9d668ae..4fe714d70 100644 --- a/apps/plugins/pdbox/PDa/src/u_pdsend.c +++ b/apps/plugins/pdbox/PDa/src/u_pdsend.c @@ -5,7 +5,7 @@ /* the "pdsend" command. This is a standalone program that forwards messages from its standard input to Pd via the netsend/netreceive ("FUDI") protocol. */ -#include "inttypes.h" +#include #include #include #include diff --git a/apps/plugins/pdbox/PDa/src/x_misc.c b/apps/plugins/pdbox/PDa/src/x_misc.c index 1bfce499c..10d872f57 100644 --- a/apps/plugins/pdbox/PDa/src/x_misc.c +++ b/apps/plugins/pdbox/PDa/src/x_misc.c @@ -17,7 +17,7 @@ extern uint64_t runningtime; #include #include #ifdef UNIX -#include "inttypes.h" +#include #include #include //#include diff --git a/apps/plugins/pdbox/PDa/src/x_net.c b/apps/plugins/pdbox/PDa/src/x_net.c index 1cb9655cd..ecd02d6b0 100644 --- a/apps/plugins/pdbox/PDa/src/x_net.c +++ b/apps/plugins/pdbox/PDa/src/x_net.c @@ -13,7 +13,7 @@ #include "s_stuff.h" #ifndef ROCKBOX -#include "inttypes.h" +#include #include #ifdef UNIX #include diff --git a/apps/codecs/libpcm/ima_adpcm_common.h b/firmware/libc/include/sys/types.h similarity index 66% copy from apps/codecs/libpcm/ima_adpcm_common.h copy to firmware/libc/include/sys/types.h index a391e4df3..ca7842857 100644 --- a/apps/codecs/libpcm/ima_adpcm_common.h +++ b/firmware/libc/include/sys/types.h @@ -7,7 +7,7 @@ * \/ \/ \/ \/ \/ * $Id$ * - * Copyright (C) 2010 Yoshihisa Uchida + * Copyright (C) 2010 Thomas Martitz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,17 +18,8 @@ * KIND, either express or implied. * ****************************************************************************/ -#ifndef CODEC_LIBPCM_IMA_ADPCM_COMMON_H -#define CODEC_LIBPCM_IMA_ADPCM_COMMON_H +/** + * provide a sys/types.h for compatibility with imported code + **/ #include "inttypes.h" -#include -#include - -#define IMA_ADPCM_INC_DEPTH (PCM_OUTPUT_DEPTH - 16) - -void init_ima_adpcm_decoder(int bit, const int *index_table); -void set_decode_parameters(int channels, int32_t *init_pcmdata, int8_t *init_index); -int16_t create_pcmdata(int ch, uint8_t nibble); -int16_t create_pcmdata_size4(int ch, uint8_t nibble); -#endif -- 2.11.4.GIT