Get rid of extra %noyyalloc etc. stuff.

Change-Id: I2af498202981a43d0f50cf014fba9116875d2819
Reviewed-on: https://code.wireshark.org/review/14824
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 3 insertions, 15 deletions

diff --git a/epan/uat_load.l b/epan/uat_load.l
index a27fb2ff2d..ace66b0e60 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -33,8 +33,9 @@
  * "unused argument" warnings from the yyscanner argument (which
  * we don't use, as we have a global memory allocator).
  *
- * We provide our own versions of the routines generated by Flex, which
- * have a "yes, this is unused, don't complain about it" flag for yyscanner.
+ * We provide, as macros, our own versions of the routines generated by Flex,
+ * which just call malloc()/realloc()/free() (as the Flex versions do),
+ * discarding the extra argument.
  */
 %option noyyalloc
 %option noyyrealloc
@@ -46,19 +47,6 @@
  */
 %option prefix="uat_load_"
 
-/*
- * We have to override the memory allocators so that we don't get
- * "unused argument" warnings from the yyscanner argument (which
- * we don't use, as we have a global memory allocator).
- *
- * We provide, as macros, our own versions of the routines generated by Flex,
- * which just call malloc()/realloc()/free() (as the Flex versions do),
- * discarding the extra argument.
- */
-%option noyyalloc
-%option noyyrealloc
-%option noyyfree
-
 %{
 	/*
 	 * uat_load.l