hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redefined ASE_XXX_COPIER_SIMPLE and ASE_XXX_COPIER_INLINE

Browse Source 
originally,
- #define ASE_XXX_COPIER_SIMPLE ase_xxx_copysimple
- #define ASE_XXX_COPIER_INLINE ase_xxx_copyinline

after changes.
- #define ASE_XXX_COPIER_SIMPLE ((ase_xxx_copier_t)1)
- #define ASE_XXX_COPIER_INLINE ((ase_xxx_copier_t)2)

when compiled for win32 dll, the reference by the original 
definition resulted in different address values in difference modules.
This commit is contained in:
hyung-hwan
2008-12-15 07:25:42 +00:00
parent 195da67d13
commit f675b072d6
11 changed files with 15 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ase/cmd/awk/makefile.am
View File

@ -5,11 +5,11 @@ bin_PROGRAMS = aseawk
aseawk_SOURCES = awk.c aseawk_SOURCES = awk.c
aseawk_LDFLAGS = -L../../lib/awk -L../../lib/utl aseawk_LDFLAGS = -L../../lib/awk -L../../lib/utl
aseawk_LDADD = -laseutl -laseawk $(LIBM) aseawk_LDADD = -laseawk $(LIBM)
if ENABLE_CXX if ENABLE_CXX
bin_PROGRAMS += aseawk++ bin_PROGRAMS += aseawk++
aseawk___SOURCES = Awk.cpp aseawk___SOURCES = Awk.cpp
aseawk___LDFLAGS = -L../../lib/awk -L../../lib/utl aseawk___LDFLAGS = -L../../lib/awk -L../../lib/utl
aseawk___LDADD = -laseutl -laseawk++ $(LIBM) aseawk___LDADD = -laseawk++ $(LIBM)
endif endif

4
ase/cmd/awk/makefile.in
View File

@ -212,10 +212,10 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
aseawk_SOURCES = awk.c aseawk_SOURCES = awk.c
aseawk_LDFLAGS = -L../../lib/awk -L../../lib/utl aseawk_LDFLAGS = -L../../lib/awk -L../../lib/utl
aseawk_LDADD = -laseutl -laseawk $(LIBM) aseawk_LDADD = -laseawk $(LIBM)
@ENABLE_CXX_TRUE@aseawk___SOURCES = Awk.cpp @ENABLE_CXX_TRUE@aseawk___SOURCES = Awk.cpp
@ENABLE_CXX_TRUE@aseawk___LDFLAGS = -L../../lib/awk -L../../lib/utl @ENABLE_CXX_TRUE@aseawk___LDFLAGS = -L../../lib/awk -L../../lib/utl
@ENABLE_CXX_TRUE@aseawk___LDADD = -laseutl -laseawk++ $(LIBM) @ENABLE_CXX_TRUE@aseawk___LDADD = -laseawk++ $(LIBM)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:

17
ase/include/ase/cmn/lda.h
View File

@ -30,8 +30,8 @@ typedef struct ase_lda_t ase_lda_t;
typedef struct ase_lda_node_t ase_lda_node_t; typedef struct ase_lda_node_t ase_lda_node_t;
typedef enum ase_lda_walk_t ase_lda_walk_t; typedef enum ase_lda_walk_t ase_lda_walk_t;
#define ASE_LDA_COPIER_SIMPLE ase_lda_copysimple #define ASE_LDA_COPIER_SIMPLE ((ase_lda_copier_t)1)
#define ASE_LDA_COPIER_INLINE ase_lda_copyinline #define ASE_LDA_COPIER_INLINE ((ase_lda_copier_t)2)
#define ASE_LDA_INVALID ((ase_size_t)-1) #define ASE_LDA_INVALID ((ase_size_t)-1)
@ -469,19 +469,6 @@ void ase_lda_rwalk (
void* arg void* arg
); );
void* ase_lda_copysimple (
ase_lda_t* lda /* a linear dynamic array */,
void* data /* the pointer to data */,
ase_size_t len /* the length of data */
);
void* ase_lda_copyinline (
ase_lda_t* lda /* a linear dynamic array */,
void* data /* the pointer to data */,
ase_size_t len /* the length of data */
);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

18
ase/include/ase/cmn/map.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: map.h 413 2008-10-09 11:45:49Z baconevi $ * $Id: map.h 483 2008-12-14 13:25:42Z baconevi $
* *
* {License} * {License}
*/ */
@ -195,8 +195,8 @@ struct ase_map_t
}; };
/******/ /******/
#define ASE_MAP_COPIER_SIMPLE ase_map_copysimple #define ASE_MAP_COPIER_SIMPLE ((ase_map_copier_t)1)
#define ASE_MAP_COPIER_INLINE ase_map_copyinline #define ASE_MAP_COPIER_INLINE ((ase_map_copier_t)2)
/****d* ase.cmn.map/ASE_MAP_SIZE /****d* ase.cmn.map/ASE_MAP_SIZE
* NAME * NAME
@ -558,18 +558,6 @@ ase_map_pair_t* ase_map_getnextpair (
ase_size_t* buckno ase_size_t* buckno
); );
void* ase_map_copysimple (
ase_map_t* map /* a linear dynamic array */,
void* data /* the pointer to data */,
ase_size_t len /* the length of data */
);
void* ase_map_copyinline (
ase_map_t* map /* a linear dynamic array */,
void* data /* the pointer to data */,
ase_size_t len /* the length of data */
);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

24
ase/include/ase/cmn/sll.h
View File

@ -162,8 +162,8 @@ struct ase_sll_node_t
}; };
/******/ /******/
#define ASE_SLL_COPIER_SIMPLE ase_sll_copysimple #define ASE_SLL_COPIER_SIMPLE ((ase_sll_copier_t)1)
#define ASE_SLL_COPIER_INLINE ase_sll_copyinline #define ASE_SLL_COPIER_INLINE ((ase_sll_copier_t)2)
#define ASE_SLL_MMGR(sll) ((sll)->mmgr) #define ASE_SLL_MMGR(sll) ((sll)->mmgr)
#define ASE_SLL_COPIER(sll) ((sll)->copier) #define ASE_SLL_COPIER(sll) ((sll)->copier)
@ -574,26 +574,6 @@ void ase_sll_walk (
); );
/******/ /******/
/*
* Causes a singly linked list to remember the pointer and the length.
* Use ASE_SLL_COPIER_SIMPLE instead.
*/
void* ase_sll_copysimple (
ase_sll_t* sll /* a singly linked list */,
void* data /* the pointer to data */,
ase_size_t len /* the length of data */
);
/*
* Causes a singly linked list to copy in data to a node.
* Use ASE_SLL_COPIER_INLINE instead.
*/
void* ase_sll_copyinline (
ase_sll_t* sll /* a singly linked list */,
void* data /* the pointer to data */,
ase_size_t len /* the length of data */
);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
ase/lib/awk/std.c
View File

@ -6,6 +6,7 @@
#include <ase/cmn/sio.h> #include <ase/cmn/sio.h>
#include <math.h> #include <math.h>
#include <stdarg.h>
#include <ase/utl/stdio.h> #include <ase/utl/stdio.h>
typedef struct ext_t typedef struct ext_t

11
ase/lib/cmn/lda.c
View File

@ -562,14 +562,3 @@ void ase_lda_rwalk (lda_t* lda, walker_t walker, void* arg)
} }
} }
void* ase_lda_copysimple (lda_t* lda, void* dptr, size_t dlen)
{
return dptr;
}
void* ase_lda_copyinline (lda_t* lda, void* dptr, size_t dlen)
{
/* this is a dummy copier */
return ASE_NULL;
}

13
ase/lib/cmn/map.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: map.c 409 2008-10-08 11:43:56Z baconevi $ * $Id: map.c 483 2008-12-14 13:25:42Z baconevi $
* *
* {License} * {License}
*/ */
@ -728,14 +728,3 @@ static int reorganize (map_t* map)
return 0; return 0;
} }
void* ase_map_copysimple (map_t* map, void* dptr, size_t dlen)
{
return dptr;
}
void* ase_map_copyinline (map_t* map, void* dptr, size_t dlen)
{
/* this is a dummy copier */
return ASE_NULL;
}

10
ase/lib/cmn/sll.c
View File

@ -329,13 +329,3 @@ void ase_sll_walk (sll_t* sll, walker_t walker, void* arg)
} }
} }
void* ase_sll_copysimple (sll_t* sll, void* dptr, size_t dlen)
{
return dptr;
}
void* ase_sll_copyinline (sll_t* sll, void* dptr, size_t dlen)
{
/* this is a dummy copier */
return ASE_NULL;
}

2
ase/lib/makefile.am
View File

@ -1,2 +1,2 @@
SUBDIRS = cmn awk lsp tgp utl SUBDIRS = cmn utl awk lsp tgp
DIST_SUBDIRS = $(SUBDIRS) DIST_SUBDIRS = $(SUBDIRS)

2
ase/lib/makefile.in
View File

@ -176,7 +176,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = cmn awk lsp tgp utl SUBDIRS = cmn utl awk lsp tgp
DIST_SUBDIRS = $(SUBDIRS) DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive all: all-recursive