Ignore:
Timestamp:
Sep 23, 2016, 6:57:20 AM (8 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch
Children:
7d01fdf
Parents:
3ffedf22 (diff), bd8a92d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into pitchshift

File:
1 edited

Legend:

Unmodified
Added
Removed

  • python/lib/moresetuptools.py

    r3ffedf22 rad65346  
    6666                         'HAVE_MATH_H', 'HAVE_STRING_H',
    6767                         'HAVE_C99_VARARGS_MACROS',
    68                          'HAVE_LIMITS_H', 'HAVE_MEMCPY_HACKS']:
     68                         'HAVE_LIMITS_H', 'HAVE_STDARG_H',
     69                         'HAVE_MEMCPY_HACKS']:
    6970        ext.define_macros += [(define_macro, 1)]
    7071
Note: See TracChangeset for help on using the changeset viewer.