diff options
author | Robert Mustacchi <rm@joyent.com> | 2018-08-27 17:15:21 +0000 |
---|---|---|
committer | Robert Mustacchi <rm@joyent.com> | 2018-08-27 18:13:46 +0000 |
commit | 6cc09d5e5f5ddf4d19751345ff40ef463c3821c2 (patch) | |
tree | 554868513bf3790a3ce0e6fab9c7275e7eb115f3 | |
parent | 45d3080b0ab9f9887e26a7f7abc3c726d5d648ef (diff) | |
download | illumos-joyent-6cc09d5e5f5ddf4d19751345ff40ef463c3821c2.tar.gz |
OS-7181 cpcgen incorrectly relies on libcmdutils.h
Reviewed by: Mike Zeller <mike.zeller@joyent.com>
Reviewed by: Jason King <jason.king@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r-- | usr/src/lib/json_nvlist/json_nvlist.h | 2 | ||||
-rw-r--r-- | usr/src/tools/cpcgen/Makefile | 2 | ||||
-rw-r--r-- | usr/src/tools/cpcgen/cpcgen.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/lib/json_nvlist/json_nvlist.h b/usr/src/lib/json_nvlist/json_nvlist.h index ca01ef44f9..75a70f445b 100644 --- a/usr/src/lib/json_nvlist/json_nvlist.h +++ b/usr/src/lib/json_nvlist/json_nvlist.h @@ -17,7 +17,7 @@ #define _JSON_NVLIST_H #include <libnvpair.h> -#include <libcmdutils.h> +#include <libcustr.h> #ifdef __cplusplus extern "C" { diff --git a/usr/src/tools/cpcgen/Makefile b/usr/src/tools/cpcgen/Makefile index 23f412439a..ec38f80e3d 100644 --- a/usr/src/tools/cpcgen/Makefile +++ b/usr/src/tools/cpcgen/Makefile @@ -19,7 +19,7 @@ OBJS = cpcgen.o json_nvlist.o custr.o include ../Makefile.tools LDLIBS += -lnvpair -CPPFLAGS += -I$(SRC)/lib/json_nvlist/ +CPPFLAGS += -I$(SRC)/lib/json_nvlist/ -I$(SRC)/lib/libcustr/common all: $(PROG) diff --git a/usr/src/tools/cpcgen/cpcgen.c b/usr/src/tools/cpcgen/cpcgen.c index daa9c255f9..d876b913fc 100644 --- a/usr/src/tools/cpcgen/cpcgen.c +++ b/usr/src/tools/cpcgen/cpcgen.c @@ -30,6 +30,9 @@ #include <sys/param.h> #include <assert.h> #include <ctype.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #include <json_nvlist.h> |