mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-13 07:10:20 +02:00
* sort.c: #include <config.h> if HAVE_CONFIG_H. Rename usage of
HAVE_ARRAYS to SCM_HAVE_ARRAYS.
This commit is contained in:
parent
eccde741c3
commit
af7a39456a
1 changed files with 7 additions and 2 deletions
|
@ -57,6 +57,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* We need this to get the definitions for HAVE_ALLOCA_H, etc. */
|
/* We need this to get the definitions for HAVE_ALLOCA_H, etc. */
|
||||||
|
#if HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* do we still need this here? */
|
||||||
#include "libguile/scmconfig.h"
|
#include "libguile/scmconfig.h"
|
||||||
|
|
||||||
/* AIX requires this to be the first thing in the file. The #pragma
|
/* AIX requires this to be the first thing in the file. The #pragma
|
||||||
|
@ -753,7 +758,7 @@ SCM_DEFINE (scm_sort, "sort", 2, 0, 0,
|
||||||
items = scm_list_copy (items);
|
items = scm_list_copy (items);
|
||||||
return scm_merge_list_step (&items, scm_cmp_function (less), less, len);
|
return scm_merge_list_step (&items, scm_cmp_function (less), less, len);
|
||||||
}
|
}
|
||||||
#ifdef HAVE_ARRAYS
|
#ifdef SCM_HAVE_ARRAYS
|
||||||
/* support ordinary vectors even if arrays not available? */
|
/* support ordinary vectors even if arrays not available? */
|
||||||
else if (SCM_VECTORP (items))
|
else if (SCM_VECTORP (items))
|
||||||
{
|
{
|
||||||
|
@ -905,7 +910,7 @@ SCM_DEFINE (scm_stable_sort, "stable-sort", 2, 0, 0,
|
||||||
items = scm_list_copy (items);
|
items = scm_list_copy (items);
|
||||||
return scm_merge_list_step (&items, scm_cmp_function (less), less, len);
|
return scm_merge_list_step (&items, scm_cmp_function (less), less, len);
|
||||||
}
|
}
|
||||||
#ifdef HAVE_ARRAYS
|
#ifdef SCM_HAVE_ARRAYS
|
||||||
/* support ordinary vectors even if arrays not available? */
|
/* support ordinary vectors even if arrays not available? */
|
||||||
else if (SCM_VECTORP (items))
|
else if (SCM_VECTORP (items))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue