Changeset 49ea49 in git


Ignore:
Timestamp:
Nov 14, 2011, 9:58:53 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
8babe7f5911040e9a652f83ae402f78b91d5c3ed
Parents:
3826d071b0fe1a52a0fa5cdc532b9c99960c5018
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-14 21:58:53+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-15 11:57:52+01:00
Message:
CHG: eliminated omalloc/omlimits.h.in->.h in favour of static mylimits.h (limits.h)
CHG: generate and use omalloc/omConfig.h (in favour of omConfig.h.in + config.h)
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed

  • Singular/mmstd.c

    r3826d0 r49ea49  
    1111
    1212#include <omalloc/omalloc.h>
    13 #include <omalloc/config.h>
    1413#include <omalloc/omConfig.h>
    1514

  • libpolys/misc/mylimits.h

    r3826d0 r49ea49  
    77 *  Version: $Id$
    88 *******************************************************************/
    9 /* on IRIX-6 machines, the values in <limits.h>
    10 * do not reflect the code generated by gcc -
    11 * so we have to use our own
    12 * (will result in "redefining warnings")
    13 */
    14 
    159#ifndef _MYLIMITS_H
    1610#define _MYLIMITS_H
    17 #ifdef IRIX
    18 #include <omalloc/omlimits.h>
    19 #else
     11
    2012#include <limits.h>
    21 #endif
    22 
    23 
    2413
    2514static const int MAX_INT_VAL = INT_MAX;
    2615
    27 
    28 
    2916#endif /* _MYLIMITS_H */

  • omalloc/Makefile.am

    r3826d0 r49ea49  
    1414omBinPage.h             omAllocSystem.h         omTables.h              \
    1515omAllocPrivate.h        omDebug.h               omInline.h              \
    16 omAllocFunc.h           omlimits.h              mylimits.h
     16omAllocFunc.h           mylimits.h
    1717
    1818noinst_HEADERS= omPage.h omDefaultConfig.h omReturn.h omGetPageSize.h \
    … …  
    3333libomalloc_g_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
    3434
    35 nodist_libomalloc_a_SOURCES = omConfig.h omlimits.h mylimits.h omalloc.h omTables.inc
    36 nodist_libomalloc_g_a_SOURCES = omConfig.h omlimits.h omalloc.h omTables.inc
     35nodist_libomalloc_a_SOURCES = omConfig.h mylimits.h omalloc.h omTables.inc
     36nodist_libomalloc_g_a_SOURCES = omConfig.h omalloc.h omTables.inc
    3737
    38 libomalloc_a_CPPFLAGS= -DOM_NDEBUG
     38libomalloc_a_CPPFLAGS= -DHAVE_CONFIG_H -DOM_NDEBUG
     39libomalloc_g_a_CPPFLAGS= -DHAVE_CONFIG_H
    3940
    4041BUILT_SOURCES = omTables.inc omTables.h
    … …  
    4748
    4849noinst_PROGRAMS = omTables
    49 omTables_SOURCES = omAllocPrivate.h omConfig.h omTables.c omlimits.h mylimits.h
    50 omTables_CPPFLAGS = -DOM_GENERATE_INC
     50omTables_SOURCES = omAllocPrivate.h omConfig.h omTables.c mylimits.h
     51omTables_CPPFLAGS = -DOM_GENERATE_INC  -DHAVE_CONFIG_H
    5152
    5253CLEANFILES = $(BUILT_SOURCES)
    … …  
    6364
    6465omtTest_g_SOURCES = $(OMTTESTSSOURCES)
     66omtTest_g_CPPFLAGS = -DHAVE_CONFIG_H
    6567omtTest_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    6668omtTest_g_LDADD = -lomalloc_g
    … …  
    6870omtTest_m: libomalloc_g.a
    6971
    70 omtTest_m_CPPFLAGS = -DOM_TEST_MALLOC
     72omtTest_m_CPPFLAGS = -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
    7173omtTest_m_SOURCES  = $(OMTTESTSSOURCES)
    7274omtTest_m_LDADD = -lomalloc_g

  • omalloc/configure.ac

    r3826d0 r49ea49  
    1212AC_CONFIG_AUX_DIR([.])
    1313
     14AC_CONFIG_HEADER(omConfig.h)
     15
    1416AM_MAINTAINER_MODE
    1517AM_INIT_AUTOMAKE([omalloc],[0.9.6])
     18
     19# Add pre'prefixed config
     20AX_PREFIX_CONFIG_H([omConfig.h],[],[omConfig.h])
    1621
    1722AC_SUBST(VERSION)
    … …  
    581586dnl wrap it up
    582587dnl
    583 AC_CONFIG_HEADER(config.h omConfig.h omlimits.h)
    584588AC_CONFIG_FILES([Makefile])
    585589AC_OUTPUT

  • omalloc/mylimits.h

    r3826d0 r49ea49  
    77 *  Version: $Id$
    88 *******************************************************************/
    9 /* on IRIX-6 machines, the values in <limits.h>
    10 * do not reflect the code generated by gcc -
    11 * so we have to use our own
    12 * (will result in "redefining warnings")
    13 */
    149
    1510#ifndef _MYLIMITS_H
     11#define _MYLIMITS_H
    1612
    17 #ifdef IRIX
    18 #include <omalloc/omlimits.h>
    19 #else
    2013#include <limits.h>
    2114
    22 #endif
    23 
    24 
    25 
    26 //static const int MAX_INT_VAL = INT_MAX;
    27 
    28 
    29 
    3015#endif /* _MYLIMITS_H */

  • omalloc/omMalloc.h

    r3826d0 r49ea49  
    99#define OM_MALLOC_H
    1010
    11 #include "config.h"
     11#include "omalloc/omConfig.h"
    1212
    1313#ifdef OMALLOC_USES_SYSTEM_MALLOC
Note: See TracChangeset for help on using the changeset viewer.