lib/mpg123
1
0
Fork 0
mirror of http://mpg123.de/trunk/.git synced 2025-10-25 04:37:34 +03:00
Code Activity

fix the bad merge of lfs_alias.c

Browse Source 
git-svn-id: svn://scm.orgis.org/mpg123/trunk@2740 35dc7657-300d-0410-a2e5-dc2837fedb53
This commit is contained in:
thor
2010-06-18 06:55:48 +00:00
parent c3077a5a3e
commit e8e45eb8f6
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libmpg123/lfs_alias.c
View File

@@ -91,23 +91,6 @@ EOT
}' < mpg123.h.in }' < mpg123.h.in
*/ */
<<<<<<< .working
int attribute_align_arg ALIAS_NAME(mpg123_open)(mpg123_handle *mh, const char *path)
{
return mpg123_open(mh, path);
}
int attribute_align_arg ALIAS_NAME(mpg123_open_fd)(mpg123_handle *mh, int fd)
{
return mpg123_open_fd(mh, fd);
}
int attribute_align_arg ALIAS_NAME(mpg123_open_handle)(mpg123_handle *mh, void *iohandle)
{
return mpg123_open_handle(mh, iohandle);
}
=======
#ifdef mpg123_open #ifdef mpg123_open
#undef mpg123_open #undef mpg123_open
#endif #endif
@@ -135,7 +118,6 @@ int attribute_align_arg ALIAS_NAME(mpg123_open_handle)(mpg123_handle *mh, void *
#ifdef mpg123_decode_frame #ifdef mpg123_decode_frame
#undef mpg123_decode_frame #undef mpg123_decode_frame
#endif #endif
>>>>>>> .merge-rechts.r2735
int attribute_align_arg ALIAS_NAME(mpg123_decode_frame)(mpg123_handle *mh, long *num, unsigned char **audio, size_t *bytes) int attribute_align_arg ALIAS_NAME(mpg123_decode_frame)(mpg123_handle *mh, long *num, unsigned char **audio, size_t *bytes)
{ {
return NATIVE_NAME(mpg123_decode_frame)(mh, num, audio, bytes); return NATIVE_NAME(mpg123_decode_frame)(mh, num, audio, bytes);