diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-13 15:16:10 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-02-13 15:16:10 -0800 |
| commit | 686d38d66754027cd29c64f1dc2975248eab7796 (patch) | |
| tree | 435569e7bdd7f2ead5c4e8584cfaf06e206ab3f4 /src/misc/util/util_hack.h | |
| parent | 8acd4edd5ade4f8836ddae292d45cdfedcb3a30c (diff) | |
| download | abc-686d38d66754027cd29c64f1dc2975248eab7796.tar.gz abc-686d38d66754027cd29c64f1dc2975248eab7796.tar.bz2 abc-686d38d66754027cd29c64f1dc2975248eab7796.zip | |
Changes to enable C++ compilation after recent modifications.
Diffstat (limited to 'src/misc/util/util_hack.h')
| -rw-r--r-- | src/misc/util/util_hack.h | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/src/misc/util/util_hack.h b/src/misc/util/util_hack.h index f7ad89f9..1a734f03 100644 --- a/src/misc/util/util_hack.h +++ b/src/misc/util/util_hack.h @@ -21,7 +21,6 @@ #ifndef __UTIL_HACK_H__ #define __UTIL_HACK_H__ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -31,50 +30,18 @@ #include "abc_global.h" - ABC_NAMESPACE_HEADER_START +#define NIL(type) ((type *) 0) -#ifndef EXTERN -#define EXTERN extern -#endif -#define NIL(type) ((type *) 0) -#define random rand -#define srandom srand - -#define util_cpu_time Extra_CpuTime -#define getSoftDataLimit Extra_GetSoftDataLimit -#define util_getopt_reset Extra_UtilGetoptReset -#define util_getopt Extra_UtilGetopt -#define util_print_time Extra_UtilPrintTime -#define util_strsav Extra_UtilStrsav -#define util_tilde_expand Extra_UtilTildeExpand -#define util_file_search Extra_UtilFileSearch -#define MMoutOfMemory Extra_UtilMMoutOfMemory - -#define util_optarg globalUtilOptarg -#define util_optind globalUtilOptind - -#ifndef ARGS -#define ARGS(protos) protos -#endif - -extern long Extra_CpuTime(); -extern int Extra_GetSoftDataLimit(); -extern void Extra_UtilGetoptReset(); -extern int Extra_UtilGetopt( int argc, char *argv[], const char *optstring ); -extern char * Extra_UtilPrintTime( long t ); -extern char * Extra_UtilStrsav( char *s ); -extern char * Extra_UtilTildeExpand( char *fname ); -extern char * Extra_UtilFileSearch( char *file, char *path, char *mode ); - -extern char * globalUtilOptarg; -extern int globalUtilOptind; - +#define util_cpu_time Extra_CpuTime +#define getSoftDataLimit Extra_GetSoftDataLimit +#define MMoutOfMemory Extra_UtilMMoutOfMemory +extern long Extra_CpuTime(); +extern int Extra_GetSoftDataLimit(); +extern void (*Extra_UtilMMoutOfMemory)( long size ); ABC_NAMESPACE_HEADER_END - - #endif |