X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/e1ec3a884f8d8c64eb7e391b2a363f47cbeed570..00e74f145ac4513e21f301b1f6ee9d0075465ab5:/regcomp.h

diff --git a/regcomp.h b/regcomp.h
index f1856b8..46a114d 100644
--- a/regcomp.h
+++ b/regcomp.h
@@ -1,7 +1,7 @@
 /*    regcomp.h
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2003, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2005 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -15,7 +15,7 @@ typedef OP OP_4tree;			/* Will be redefined later. */
  * compile to execute that permits the execute phase to run lots faster on
  * simple cases.  They are:
  *
- * regstart	sv that must begin a match; Nullch if none obvious
+ * regstart	sv that must begin a match; NULL if none obvious
  * reganch	is the match anchored (at beginning-of-line only)?
  * regmust	string (pointer into program) that match must include, or NULL
  *  [regmust changed to SV* for bminstr()--law]
@@ -154,15 +154,9 @@ struct regnode_charclass_class {	/* has [[:blah:]] classes */
 #undef NEXT_OFF
 #undef NODE_ALIGN
 
-#ifndef lint
-#  define NEXT_OFF(p) ((p)->next_off)
-#  define NODE_ALIGN(node)
-#  define NODE_ALIGN_FILL(node) ((node)->flags = 0xde) /* deadbeef */
-#else /* lint */
-#  define NEXT_OFF(p) 0
-#  define NODE_ALIGN(node)
-#  define NODE_ALIGN_FILL(node)
-#endif /* lint */
+#define NEXT_OFF(p) ((p)->next_off)
+#define NODE_ALIGN(node)
+#define NODE_ALIGN_FILL(node) ((node)->flags = 0xde) /* deadbeef */
 
 #define SIZE_ALIGN NODE_ALIGN
 
@@ -309,15 +303,11 @@ struct regnode_charclass_class {	/* has [[:blah:]] classes */
 /*
  * Utility definitions.
  */
-#ifndef lint
 #ifndef CHARMASK
-#define	UCHARAT(p)	((int)*(const U8*)(p))
+#  define UCHARAT(p)	((int)*(const U8*)(p))
 #else
-#define	UCHARAT(p)	((int)*(p)&CHARMASK)
+#  define UCHARAT(p)	((int)*(p)&CHARMASK)
 #endif
-#else /* lint */
-#define UCHARAT(p)	PL_regdummy
-#endif /* lint */
 
 #define EXTRA_SIZE(guy) ((sizeof(guy)-1)/sizeof(struct regnode))