merged

[henge/webcc.git] / src / apc / scanner.c

diff --git a/src/apc/scanner.c b/src/apc/scanner.c
index b1b7998..55245af 100644 (file)
--- a/src/apc/scanner.c
+++ b/src/apc/scanner.c
@@ -127,11 +127,6 @@ void scanner_quit
 */
 int scanner
 #define $($)#$ //stringifier
-#ifdef _DIRENT_HAVE_D_NAMLEN
-#define MAX_DNAME _D_ALLOC_NAMLEN(DL_CD())
-#else
-#define MAX_DNAME 1024
-#endif
 #define ERR_CHILD  "Fatal: Maximum of " $(DL_CD_STACKSIZE)                  \
   " child directories exceeded for directory at depth %i\n"                \
   ,DL_LEN()
@@ -148,7 +143,11 @@ int scanner
   if (DL_CD_LEN() > 0)               //There are entities to process
     { if (DL_CD_POP() == NULL)            //If the dirent is null, then the
         goto libfail;                       //lib function in dirent has failed
+<<<<<<< HEAD
+      ntok += lexer_lexstring(DL_CD_CURNAME());//lex the directory name
+=======
       ntok += lexer_lexstring(DL_CD_CURNAME());  //lex the directory name
+>>>>>>> 15d3ab5e7871ff459af13089b82bf5f17f731ebd
       if (DL_LEN() >= DL_STACKSIZE)       //fail if maxdepth exceeded
         { fprintf(stderr, ERR_DEPTH);
           goto fail;