Changeset 263824 in git


Ignore:
Timestamp:
May 29, 1999, 4:32:43 PM (25 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')
Children:
04abb5627eef7a26b510f0c92933fb1e84a0b2e9
Parents:
c8343c4454ffbfd07e6f50206bf6c595c1ba8831
Message:
* fixed gmalloc handling for GNULIBC 2


git-svn-id: file:///usr/local/Singular/svn/trunk@3083 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.in

    rc8343c r263824  
    4949CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@
    5050CPPFLAGS        = -I${srcdir} @CPPFLAGS@
    51 DEFS            = -DNDEBUG -D@SING_UNAME@
     51DEFS            = -DNDEBUG -D@SING_UNAME@ @DEFS@
    5252LDFLAGS         = @LDFLAGS@
    5353LD_DYN_FLAGS    = @LD_DYN_FLAGS@

  • Singular/gmalloc.c

    rc8343c r263824  
    99*/   
    1010
     11#ifdef HAVE_CONFIG_H
    1112#include "mod2.h"
    12 
    13 #ifdef HAVE_GMALLOC
     13#endif
     14
     15/* #ifdef HAVE_GMALLOC */
     16#if 1
    1417
    1518
    … …  
    332335#include <stddef.h>
    333336#include <sys/cdefs.h>
    334 extern size_t __getpagesize __P ((void));
     337/* obachman: no declaration: conflicts with gnulibc6 unistd.h */
     338/* extern size_t __getpagesize __P ((void)); */
    335339#else
    336340#if 0 /* obachman: pasted in getpagesize.h manually */
    … …  
    372376#endif /* no _SC_PAGESIZE */
    373377
     378/* obachman: undef , gnulibc6 conflict with unistd.h */
    374379#define  __getpagesize()        getpagesize()
    375380#endif /* if 0 */
    … …  
    388393{
    389394  if (pagesize == 0)
     395/* obachman: use getpagesize, instead
    390396    pagesize = __getpagesize ();
     397*/
     398    pagesize = getpagesize ();
    391399
    392400  return memalign (pagesize, size);
Note: See TracChangeset for help on using the changeset viewer.