diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:41:11 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:41:11 +0000 |
| commit | ff7fa12b29d94dd6bec98d550bb8246479ed054b (patch) | |
| tree | 50d68cbb204a0b6fcdaa67396555ffaab8c9c917 | |
| parent | cf0f34454efeafb21631f2e5e36709af61018de2 (diff) | |
| download | xorg-util-makedepend-XACE-SELINUX.tar.gz | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | imakemdep.h | 14 | ||||
| -rw-r--r-- | main.c | 12 |
2 files changed, 12 insertions, 14 deletions
diff --git a/imakemdep.h b/imakemdep.h index db17752..38a6d95 100644 --- a/imakemdep.h +++ b/imakemdep.h @@ -371,11 +371,11 @@ char *cpp_argv[ARGUMENTS] = { # ifdef __ia64__ "-D__ia64__", # endif -# ifdef __AMD64__ - "-D__AMD64__", +# ifdef __amd64__ + "-D__amd64__", # endif # ifdef __x86_64__ - "-D__AMD64__", + "-D__amd64__", # endif # ifdef __s390__ "-D__s390__", @@ -1264,12 +1264,12 @@ struct symtab predefs[] = { # ifdef __ia64__ {"__ia64__", "1"}, # endif -# if defined (AMD64) || defined (x86_64) - {"AMD64", "1"}, +# if defined (amd64) || defined (x86_64) + {"amd64", "1"}, {"x86_64", "1"}, # endif -# if defined (__AMD64__) || defined (__x86_64__) - {"__AMD64__", "1"}, +# if defined (__amd64__) || defined (__x86_64__) + {"__amd64__", "1"}, {"__x86_64__", "1"}, # endif # ifdef __i386 @@ -56,12 +56,10 @@ int _debugmask; #endif /* #define DEBUG_DUMP */ -#if 0 #ifdef DEBUG_DUMP -#define DBG_PRINT(args...) fprintf(args) +#define DBG_PRINT(file, fmt, args) fprintf(file, fmt, args) #else -#define DBG_PRINT(args...) /* empty */ -#endif +#define DBG_PRINT(file, fmt, args) /* empty */ #endif #define DASH_INC_PRE "#include \"" @@ -492,7 +490,7 @@ main(int argc, char *argv[]) * now peruse through the list of files. */ for(fp=filelist; *fp; fp++) { - /* DBG_PRINT(stderr,"file: %s\n",*fp); */ + DBG_PRINT(stderr,"file: %s\n",*fp); filecontent = getfile(*fp); setfile_cmdinc(filecontent, cmdinc_count, cmdinc_list); ip = newinclude(*fp, (char *)NULL); @@ -614,7 +612,7 @@ char *getnextline(struct filepointer *filep) char *buf = filep->cmdinc_list[2 * filep->cmdinc_line + 1]; filep->cmdinc_line++; sprintf(buf,"%s%s%s",DASH_INC_PRE,inc,DASH_INC_POST); - /* DBG_PRINT(stderr,"%s\n",buf); */ + DBG_PRINT(stderr,"%s\n",buf); return(buf); } @@ -719,7 +717,7 @@ done: filep->f_line = lineno; #ifdef DEBUG_DUMP if (bol) - /* DBG_PRINT(stderr,"%s\n",bol); */ + DBG_PRINT(stderr,"%s\n",bol); #endif return(bol); } |