svn commit: r291127 - head/usr.bin/colldef

[Baptiste Daroussin]

Author: bapt
Date: Sat Nov 21 10:52:32 2015
New Revision: 291127
URL: https://svnweb.freebsd.org/changeset/base/291127

Log:
  colldef(1) does not need the libc's internal collate.h header anymore

Modified:
  head/usr.bin/colldef/Makefile
  head/usr.bin/colldef/parse.y

Modified: head/usr.bin/colldef/Makefile
==============================================================================
--- head/usr.bin/colldef/Makefile	Sat Nov 21 10:22:01 2015	(r291126)
+++ head/usr.bin/colldef/Makefile	Sat Nov 21 10:52:32 2015	(r291127)
@@ -3,7 +3,7 @@
 PROG=	colldef
 SRCS=	parse.y scan.l y.tab.h
 LFLAGS=	-8 -i
-CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
+CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT -DYY_NO_INPUT
 LIBADD=	l
 

Modified: head/usr.bin/colldef/parse.y
==============================================================================
--- head/usr.bin/colldef/parse.y	Sat Nov 21 10:22:01 2015	(r291126)
+++ head/usr.bin/colldef/parse.y	Sat Nov 21 10:52:32 2015	(r291127)
@@ -32,12 +32,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <err.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sysexits.h>
-#include "collate.h"
 #include "common.h"
 
 extern FILE *yyin;