mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Moved ERR and SYSERR to a global place

Browse source
This commit is contained in:
Abramo Bagnara 2001-01-01 15:15:41 +00:00
parent 382bba4c8f
commit 77d992bebc
6 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Makefile.am
View file

@ -7,7 +7,7 @@ header_files=header.h version.h global.h error.h control.h mixer.h pcm.h \
rawmidi.h timer.h hwdep.h seq.h seqmid.h seq_midi_event.h \ rawmidi.h timer.h hwdep.h seq.h seqmid.h seq_midi_event.h \
conv.h instr.h conf.h footer.h conv.h instr.h conf.h footer.h
noinst_HEADERS=$(header_files) search.h list.h aserver.h noinst_HEADERS=$(header_files) search.h list.h aserver.h local.h
asoundlib.h: $(header_files) asoundlib.h: $(header_files)
cat $^ > $@ cat $^ > $@

29
include/local.h Normal file
View file

@ -0,0 +1,29 @@
/*
* ALSA lib - local header file
* Copyright (c) 2000 by Abramo Bagnara <abramo@alsa-project.org>
*
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library 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 Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
#else
#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
#endif

9
src/control/control_local.h
View file

@ -21,16 +21,9 @@
#include <assert.h> #include <assert.h>
#include "asoundlib.h" #include "asoundlib.h"
#include "local.h"
#include "list.h" #include "list.h"
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
#else
#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
#endif
typedef struct { typedef struct {
int (*close)(snd_ctl_t *handle); int (*close)(snd_ctl_t *handle);
int (*card)(snd_ctl_t *handle); int (*card)(snd_ctl_t *handle);

9
src/pcm/pcm_local.h
View file

@ -27,14 +27,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <errno.h> #include <errno.h>
#include "asoundlib.h" #include "asoundlib.h"
#include "local.h"
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
#else
#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
#endif
typedef struct _snd_pcm_channel_info { typedef struct _snd_pcm_channel_info {
unsigned int channel; unsigned int channel;

9
src/rawmidi/rawmidi_local.h
View file

@ -25,14 +25,7 @@
#include <limits.h> #include <limits.h>
#include <errno.h> #include <errno.h>
#include "asoundlib.h" #include "asoundlib.h"
#include "local.h"
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
#else
#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
#endif
typedef struct { typedef struct {
int (*close)(snd_rawmidi_t *rawmidi); int (*close)(snd_rawmidi_t *rawmidi);

9
src/seq/seq_local.h
View file

@ -29,19 +29,12 @@
#include <limits.h> #include <limits.h>
#include <errno.h> #include <errno.h>
#include "asoundlib.h" #include "asoundlib.h"
#include "local.h"
#define SND_SEQ_OBUF_SIZE (16*1024) /* default size */ #define SND_SEQ_OBUF_SIZE (16*1024) /* default size */
#define SND_SEQ_IBUF_SIZE 500 /* in event_size aligned */ #define SND_SEQ_IBUF_SIZE 500 /* in event_size aligned */
#define DEFAULT_TMPBUF_SIZE 20 #define DEFAULT_TMPBUF_SIZE 20
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
#else
#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
#endif
typedef struct { typedef struct {
int (*close)(snd_seq_t *seq); int (*close)(snd_seq_t *seq);
int (*nonblock)(snd_seq_t *seq, int nonblock); int (*nonblock)(snd_seq_t *seq, int nonblock);