Commit b61721fb authored by Alexander Gottwald's avatar Alexander Gottwald

merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

parent 39892755
......@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.11 2001/12/17 20:52:22 dawes Exp $ */
/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.10 2001/12/14 19:53:20 dawes Exp $ */
#include "def.h"
......
......@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/config/makedepend/def.h,v 3.14 2003/01/17 17:09:49 tsi Exp $ */
/* $XFree86: xc/config/makedepend/def.h,v 3.13tsi Exp $ */
#include "Xos.h"
#include "Xfuncproto.h"
......
......@@ -59,7 +59,7 @@
*
* ParseIfExpression parse a string for #if
*/
/* $XFree86: xc/config/makedepend/ifparser.c,v 3.11 2002/09/23 01:48:08 tsi Exp $ */
/* $XFree86: xc/config/makedepend/ifparser.c,v 3.10tsi Exp $ */
#include "ifparser.h"
#include <ctype.h>
......
......@@ -57,7 +57,7 @@
* ParseIfExpression parse a string for #if
*/
/* $XFree86: xc/config/makedepend/ifparser.h,v 3.5 2001/07/25 15:04:40 dawes Exp $ */
/* $XFree86: xc/config/makedepend/ifparser.h,v 3.4 2001/01/17 16:38:58 dawes Exp $ */
#include <stdio.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__",
......@@ -1014,9 +1014,18 @@ struct symtab predefs[] = {
#ifdef sparc
{"sparc", "1"},
#endif
#ifdef __sparc
{"__sparc", "1"},
#endif
#ifdef __sparcv9
{"__sparcv9", "1"},
#endif
#ifdef __sparc__
{"__sparc__", "1"},
#endif
#ifdef __sparcv9__
{"__sparcv9__", "1"},
#endif
#ifdef hpux
{"hpux", "1"},
#endif
......@@ -1255,14 +1264,17 @@ 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
{"__i386", "1"},
# endif
# ifdef __i386__
{"__i386__", "1"},
# endif
......
......@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/config/makedepend/include.c,v 3.7 2001/12/14 19:53:20 dawes Exp $ */
/* $XFree86: xc/config/makedepend/include.c,v 3.6 2001/04/29 23:25:02 tsi Exp $ */
#include "def.h"
......
......@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/config/makedepend/main.c,v 3.32 2003/03/26 20:43:48 tsi Exp $ */
/* $XFree86: xc/config/makedepend/main.c,v 3.31tsi Exp $ */
#include "def.h"
#ifdef hpux
......@@ -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);
}
......
......@@ -23,7 +23,7 @@
.\" dealing in this Software without prior written authorization from The
.\" Open Group.
.\"
.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.7 2002/12/14 02:39:45 dawes Exp $
.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.6 2001/12/17 20:52:22 dawes Exp $
.\"
.TH MAKEDEPEND 1 __xorgversion__
.UC 4
......
......@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/config/makedepend/parse.c,v 1.12 2002/02/26 05:09:10 tsi Exp $ */
/* $XFree86: xc/config/makedepend/parse.c,v 1.11 2001/12/17 20:52:22 dawes Exp $ */
#include "def.h"
......
......@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/config/makedepend/pr.c,v 1.5 2001/12/14 19:53:21 dawes Exp $ */
/* $XFree86: xc/config/makedepend/pr.c,v 1.4 2001/04/29 23:25:02 tsi Exp $ */
#include "def.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment