diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-13 13:40:21 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-13 13:40:21 -0800 |
| commit | d99de60e6c88e5f6157b1d5c9b25cfd5d08a1c9a (patch) | |
| tree | 835ca54bbe84a67491db085096871431df19b6ee /src/misc/st/st.h | |
| parent | 350bedf53f6132d5c1af988e449a05c060943cd4 (diff) | |
| download | abc-d99de60e6c88e5f6157b1d5c9b25cfd5d08a1c9a.tar.gz abc-d99de60e6c88e5f6157b1d5c9b25cfd5d08a1c9a.tar.bz2 abc-d99de60e6c88e5f6157b1d5c9b25cfd5d08a1c9a.zip | |
Portability changes to the st package.
Diffstat (limited to 'src/misc/st/st.h')
| -rw-r--r-- | src/misc/st/st.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/misc/st/st.h b/src/misc/st/st.h index 81bd461e..d16fc4b6 100644 --- a/src/misc/st/st.h +++ b/src/misc/st/st.h @@ -14,17 +14,35 @@ #ifndef ST_INCLUDED #define ST_INCLUDED - #include "abc_global.h" ABC_NAMESPACE_HEADER_START + +/* These are potential duplicates. */ +#ifndef EXTERN +# ifdef __cplusplus +# ifdef ABC_NAMESPACE +# define EXTERN extern +# else +# define EXTERN extern "C" +# endif +# else +# define EXTERN extern +# endif +#endif + +#ifndef ARGS +#define ARGS(protos) protos +#endif + + typedef int (*st_compare_func_type)(const char*, const char*); typedef int (*st_hash_func_type)(const char*, int); typedef struct st_table_entry st_table_entry; struct st_table_entry { - const char *key; + char *key; char *record; st_table_entry *next; }; @@ -53,7 +71,7 @@ struct st_generator { enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE}; -typedef enum st_retval (*ST_PFSR)(const char *, char *, char *); +typedef enum st_retval (*ST_PFSR)(char *, char *, char *); typedef int (*ST_PFI)(); extern st_table *st_init_table_with_params (st_compare_func_type compare, st_hash_func_type hash, int size, int density, double grow_factor, int reorder_flag); |