assume stdint.h and stddef.h are available
Since we use a C99 compiler now, we can assert that the C99 standard headers are available, no need for complicated compile time checks. Kill mpd_types.h.
This commit is contained in:
parent
35d519625d
commit
a7651b9d30
|
@ -69,7 +69,6 @@ mpd_headers = \
|
|||
log.h \
|
||||
ls.h \
|
||||
main_notify.h \
|
||||
mpd_types.h \
|
||||
normalize.h \
|
||||
compress.h \
|
||||
os_compat.h \
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#ifndef AUDIO_FORMAT_H
|
||||
#define AUDIO_FORMAT_H
|
||||
|
||||
#include "mpd_types.h"
|
||||
#include <stdint.h>
|
||||
|
||||
struct audio_format {
|
||||
uint32_t sampleRate;
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
*/
|
||||
|
||||
#include "charConv.h"
|
||||
#include "mpd_types.h"
|
||||
#include "utf8.h"
|
||||
#include "utils.h"
|
||||
#include "path.h"
|
||||
|
|
|
@ -1,68 +0,0 @@
|
|||
/* the Music Player Daemon (MPD)
|
||||
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
||||
* This project's homepage is: http://www.musicpd.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef MPD_TYPES_H
|
||||
#define MPD_TYPES_H
|
||||
|
||||
#include "../config.h"
|
||||
|
||||
#if defined(HAVE_INTTYPES_H)
|
||||
/*
|
||||
* inttypes.h pulls in stdint.h on C99 systems, needed for older systems
|
||||
* that didn't provide stdint.h but still defined equivalent types.
|
||||
*/
|
||||
# include <inttypes.h>
|
||||
#elif defined(HAVE_STDINT_H)
|
||||
# include <stdint.h>
|
||||
#elif defined(HAVE_SYS_INTTYPES_H)
|
||||
# include <sys/inttypes.h> /* some ancient systems had this, untested */
|
||||
#endif /* C99-ish type headers */
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#if (!defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H))
|
||||
|
||||
/*
|
||||
* this only includes a partial subset of what is expected in a C99
|
||||
* stdint.h or inttypes.h; but includes enough of what is needed for mpd
|
||||
* to function on older platforms
|
||||
* (especially Linux ones still using gcc 2.95)
|
||||
*/
|
||||
|
||||
typedef unsigned char uint8_t;
|
||||
typedef signed char int8_t;
|
||||
|
||||
#if SIZEOF_SHORT == 2
|
||||
typedef unsigned short uint16_t;
|
||||
typedef signed short int16_t;
|
||||
#elif SIZEOF_INT == 2
|
||||
typedef unsigned int uint16_t;
|
||||
typedef signed int int16_t;
|
||||
#endif /* (u)int_16_t */
|
||||
|
||||
#if SIZEOF_INT == 4
|
||||
typedef unsigned int uint32_t;
|
||||
typedef signed int int32_t;
|
||||
#elif SIZEOF_LONG == 4
|
||||
typedef unsigned long uint32_t;
|
||||
typedef signed long int32_t;
|
||||
#endif /* (u)int_32 */
|
||||
|
||||
#endif /* !HAVE_STDINT_H && !HAVE_INTTYPES_H */
|
||||
|
||||
#endif
|
|
@ -31,11 +31,9 @@
|
|||
* 2) optional features in core (libsamplerate, avahi, ...)
|
||||
*/
|
||||
|
||||
#include "mpd_types.h"
|
||||
|
||||
#define _XOPEN_SOURCE 600 /* for posix_fadvise, won't hurt if not available */
|
||||
#include <fcntl.h>
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -17,8 +17,6 @@
|
|||
*/
|
||||
|
||||
#include "pcm_utils.h"
|
||||
|
||||
#include "mpd_types.h"
|
||||
#include "log.h"
|
||||
#include "utils.h"
|
||||
#include "conf.h"
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
#include "../config.h"
|
||||
|
||||
#include "mpd_types.h"
|
||||
#include "os_compat.h"
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef HAVE_LIBSAMPLERATE
|
||||
#include <samplerate.h>
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#define PLAYER_H
|
||||
|
||||
#include "notify.h"
|
||||
#include "mpd_types.h"
|
||||
#include "song.h"
|
||||
#include "os_compat.h"
|
||||
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include "log.h"
|
||||
#include "conf.h"
|
||||
#include "audio_format.h"
|
||||
#include "mpd_types.h"
|
||||
#include "os_compat.h"
|
||||
|
||||
/* Added 4/14/2004 by AliasMrJones */
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#define SONG_H
|
||||
|
||||
#include "os_compat.h"
|
||||
#include "mpd_types.h"
|
||||
|
||||
#define SONG_BEGIN "songList begin"
|
||||
#define SONG_END "songList end"
|
||||
|
|
Loading…
Reference in New Issue