diff options
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/ctf/ctf_create.c | 4 | ||||
| -rw-r--r-- | usr/src/common/font/font.c | 21 |
2 files changed, 3 insertions, 22 deletions
diff --git a/usr/src/common/ctf/ctf_create.c b/usr/src/common/ctf/ctf_create.c index c0a4b15055..355165eb12 100644 --- a/usr/src/common/ctf/ctf_create.c +++ b/usr/src/common/ctf/ctf_create.c @@ -1986,7 +1986,7 @@ ctf_add_function(ctf_file_t *fp, ulong_t idx, const ctf_funcinfo_t *fip, if (ctf_dsd_lookup(fp, idx) != NULL) return (ctf_set_errno(fp, ECTF_CONFLICT)); - if (symbase == NULL) + if (symbase == (uintptr_t)NULL) return (ctf_set_errno(fp, ECTF_STRTAB)); if (idx > fp->ctf_nsyms) @@ -2053,7 +2053,7 @@ ctf_add_object(ctf_file_t *fp, ulong_t idx, ctf_id_t type) if (ctf_dsd_lookup(fp, idx) != NULL) return (ctf_set_errno(fp, ECTF_CONFLICT)); - if (symbase == NULL) + if (symbase == (uintptr_t)NULL) return (ctf_set_errno(fp, ECTF_STRTAB)); if (idx > fp->ctf_nsyms) diff --git a/usr/src/common/font/font.c b/usr/src/common/font/font.c index f7a1abd914..8333428e2f 100644 --- a/usr/src/common/font/font.c +++ b/usr/src/common/font/font.c @@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/systm.h> #include <sys/tem_impl.h> +#include <sys/rgb.h> #include <sys/font.h> #include <sys/sysmacros.h> @@ -51,26 +52,6 @@ const uint8_t dim_xlate[] = { 1, 5, 3, 7, 2, 6, 4, 8 }; const uint8_t brt_xlate[] = { 9, 13, 11, 15, 10, 14, 12, 0 }; -/* The pc color here is actually referring to standard 16 color VGA map. */ -typedef enum pc_colors { - pc_black = 0, - pc_blue = 1, - pc_green = 2, - pc_cyan = 3, - pc_red = 4, - pc_magenta = 5, - pc_brown = 6, - pc_white = 7, - pc_grey = 8, - pc_brt_blue = 9, - pc_brt_green = 10, - pc_brt_cyan = 11, - pc_brt_red = 12, - pc_brt_magenta = 13, - pc_yellow = 14, - pc_brt_white = 15 -} pc_colors_t; - const uint8_t solaris_color_to_pc_color[16] = { pc_brt_white, /* 0 - brt_white */ pc_black, /* 1 - black */ |