openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-23 01:49:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove file merge artifacts.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2004-04-02 08:44:38 +00:00
parent 7a501162ee
commit fb5ef5ed0c
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MacOS9/config.h
View File

@ -20,14 +20,10 @@
#define ENABLE_EXPERIMENTAL_CODE 0
/* Major version of GCC or 3 otherwise. */
<<<<<<< diff from left file
/* #undef GCC_MAJOR_VERSION */
========
#define GCC_MAJOR_VERSION 3
/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
#define HAVE_ALSA_ASOUNDLIB_H 1
>>>>>>> diff from right file
/* #undef HAVE_ALSA_ASOUNDLIB_H */
/* Define to 1 if you have the `calloc' function. */
#define HAVE_CALLOC 1

6
Win32/config.h
View File

@ -43,14 +43,10 @@
#define ENABLE_EXPERIMENTAL_CODE 0
/* Major version of GCC or 3 otherwise. */
<<<<<<< diff from left file
/* #undef GCC_MAJOR_VERSION */
========
#define GCC_MAJOR_VERSION 3
/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
#define HAVE_ALSA_ASOUNDLIB_H 1
>>>>>>> diff from right file
/* #undef HAVE_ALSA_ASOUNDLIB_H */
/* Define to 1 if you have the `calloc' function. */
#define HAVE_CALLOC 1