diff options
| author | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-08-03 21:23:37 +0000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-08-04 15:09:36 +0000 |
| commit | 481cd288917954faeea10791504479f6084d2602 (patch) | |
| tree | 0e127e5ac7e0965f7e8f872dbe0e71ac54eeb664 | |
| parent | 307a938260b178544e5468346c1a036e497c7dd0 (diff) | |
| download | illumos-joyent-481cd288917954faeea10791504479f6084d2602.tar.gz | |
OS-4592 lxbrand fix lx_proc header guards
| -rw-r--r-- | usr/src/uts/common/brand/lx/procfs/lx_proc.h | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/lxproc/lxproc.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/usr/src/uts/common/brand/lx/procfs/lx_proc.h b/usr/src/uts/common/brand/lx/procfs/lx_proc.h index f331e25db2..52330936d6 100644 --- a/usr/src/uts/common/brand/lx/procfs/lx_proc.h +++ b/usr/src/uts/common/brand/lx/procfs/lx_proc.h @@ -24,12 +24,13 @@ * Copyright 2015 Joyent, Inc. */ +#ifndef _LX_PROC_H +#define _LX_PROC_H + #ifdef _LXPROC_NATIVE_H #error Attempted to include branded lx_proc.h after native lxproc.h #endif -#ifndef _LXPROC_H -#define _LXPROC_H #define _LXPROC_BRANDED_H #ifdef __cplusplus @@ -302,4 +303,4 @@ void lxpr_unlock(proc_t *); #define toupper(x) (islower(x) ? (x) - 'a' + 'A' : (x)) #endif -#endif /* _LXPROC_H */ +#endif /* _LX_PROC_H */ diff --git a/usr/src/uts/common/fs/lxproc/lxproc.h b/usr/src/uts/common/fs/lxproc/lxproc.h index e3718372e0..eadb2ccd27 100644 --- a/usr/src/uts/common/fs/lxproc/lxproc.h +++ b/usr/src/uts/common/fs/lxproc/lxproc.h @@ -24,15 +24,16 @@ */ /* - * Copyright 2015 Joyent, Inc. All rights reserved. + * Copyright 2015 Joyent, Inc. */ +#ifndef _LXPROC_H +#define _LXPROC_H + #ifdef _LXPROC_BRANDED_H #error Attempted to include native lxproc.h after branded lx_proc.h #endif -#ifndef _LXPROC_H -#define _LXPROC_H #define _LXPROC_NATIVE_H #ifdef __cplusplus |