Changeset 61fc1e in git for xalloc


Ignore:
Timestamp:
Feb 13, 2017, 3:48:56 PM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
5d4e04d77fef5104429b3e4280bdb19ce50bd4de
Parents:
c881d2b553a7c6f261ea2ee679a13bee8509daa9f6e134d4455dbb70a1514f4e5f64dac2e165f062
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-02-13 15:48:56+01:00
git-committer:
GitHub <noreply@github.com>2017-02-13 15:48:56+01:00
Message:
Merge pull request #808 from embray/cygwin/shared

Allow libSingular and associated libraries to be built as shared libraries on Cygwin
Location:
xalloc
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • xalloc/Makefile.am

    rc881d2 r61fc1e  
    1313libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
    1414
    15 libomalloc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
     15libomalloc_la_LDFLAGS    = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
    1616
    1717libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS}

  • xalloc/configure.ac

    rc881d2 r61fc1e  
    4444AC_C_INLINE
    4545
    46 LT_INIT
     46LT_INIT([win32-dll])
     47
     48SING_WIN_FLAGS
    4749
    4850

  • xalloc/omalloc.h

    rf6e134 r61fc1e  
    8787}
    8888#define omReallocAligned(A,B) omRealloc(A,B)
    89 static inline void *omReallocSize(void *d, size_t os, size_t ns)
     89static inline void *omReallocSize(void *d, __attribute__((unused)) size_t os, size_t ns)
    9090{ if (d==NULL) return omAlloc(ns);
    9191  else
    … …  
    114114  return n;
    115115}
    116 static inline void omFreeSize(void *d, size_t s)
     116static inline void omFreeSize(void *d, __attribute__((unused)) size_t s)
    117117{ if (d!=NULL) { long *dd=(long*)d; dd--; free(dd);}}
    118118
    … …  
    185185#define omMarkMemoryAsStatic()
    186186#define omfree(P)                omFree(P)
    187 #define omFree(P)                omFree(P)
    188187#define omFreeBin(P,B)           omFree(P)
    189188#define omfreeSize(P,S)          omFreeSize(P,S)
    … …  
    208207#define omReallocAlignedSize         omReallocSize
    209208#define omRealloc0AlignedSize        omRealloc0Size
    210 #define omMemDupAligned     omMemDup
     209#define omMemDupAligned              omMemDup
    211210#define omCheckIf(cond, test)                    do {} while (0)
    212211#define omCheckBinAddr(addr)                     do {} while (0)
Note: See TracChangeset for help on using the changeset viewer.