Changeset 421acf in git

Timestamp:

Jun 30, 1999, 1:53:59 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

2a7c6dbb1e3077525d8ae4337fd1a619f07e6bfd

Parents:

2466d20119e74ce4c65be5b691035f06c0faf735

Message:

*hannes: added Aligned for SIZEOF_DOUBLE=SIZEOF_PTR


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

File:

• Singular/mmemory.h (modified) (5 diffs)

Singular/mmemory.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmemory.h,v 1.18 1999-06-08 08:20:20 Singular Exp $ */
+/* $Id: mmemory.h,v 1.19 1999-06-30 11:53:59 Singular Exp $ */
 /*
 * ABSTRACT
@@ -34 +34 @@
 void   mmFree( void* );
 char * mmStrdup( const char* );
+#if SIZEOF_DOUBLE == SIZEOF_VOIDP + SIZEOF_VOIDP
 void * mmAllocAlignedBlock( size_t );
 void * mmAllocAlignedBlock0( size_t );
 void   mmFreeAlignedBlock( void*, size_t );
+#endif
 
 #define AllocHeap               mmAllocHeap
@@ -48 +50 @@
 #define AllocL                  mmAlloc
 #define mstrdup                 mmStrdup
+#if SIZEOF_DOUBLE == SIZEOF_VOIDP + SIZEOF_VOIDP
 #define AllocAligned0           mmAllocAlignedBlock0
 #define AllocAligned            mmAllocAlignedBlock
 #define FreeAligned             mmFreeAlignedBlock
+#elif SIZEOF_DOUBLE == SIZEOF_VOIDP
+#define AllocAligned0           mmAllocBlock0
+#define AllocAligned            mmAllocBlock
+#define FreeAligned             mmFreeBlock
+#endif
 
 #else /* MDEBUG */
@@ -65 +73 @@
 void   mmDBFree( void*, char*, int );
 char * mmDBStrdup( const char * s, char *fname, int lineno);
+#if SIZEOF_DOUBLE == SIZEOF_VOIDP + SIZEOF_VOIDP
 void * mmDBAllocAlignedBlock( size_t, char*, int );
 void * mmDBAllocAlignedBlock0( size_t,  char*, int);
 void   mmDBFreeAlignedBlock( void*, size_t, char*, int );
+#endif
 
 #define AllocHeap(res, heap)\
@@ -81 +91 @@
 #define FreeL(a)                mmDBFree(a,__FILE__,__LINE__)
 #define mstrdup(s)              mmDBStrdup(s, __FILE__, __LINE__)
+#if SIZEOF_DOUBLE == SIZEOF_VOIDP + SIZEOF_VOIDP
 #define AllocAligned(s)         mmDBAllocAlignedBlock(s, __FILE__, __LINE__)
 #define AllocAligned0(s)        mmDBAllocAlignedBlock0(s, __FILE__, __LINE__)
 #define FreeAligned(a,s)        mmDBFreeAlignedBlock(a, s, __FILE__, __LINE__)
+#elif SIZEOF_DOUBLE == SIZEOF_VOIDP
+#define AllocAligned(s)         mmDBAllocBlock(s, __FILE__, __LINE__)
+#define AllocAligned0(s)        mmDBAllocBlock0(s, __FILE__, __LINE__)
+#define FreeAligned(a,s)        mmDBFreeBlock(a, s, __FILE__, __LINE__)
+#endif
 
 #endif /* MDEBUG */