Merge pull request #1676 from 0x0916/2017-07-05/fix-headers

src/include/getline.h

@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _getline_h
-#define _getline_h
+#ifndef _GETLINE_H
+#define _GETLINE_H
 
 #include <stdio.h>
 

src/include/getsubopt.h

-#ifndef _getsubopt_h
-#define _getsubopt_h
+#ifndef _GETSUBOPT_H
+#define _GETSUBOPT_H
 int getsubopt (char **optionp, char *const *tokens, char **valuep);
 #endif

src/include/lxcmntent.h

@@ -18,8 +18,8 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _lxcmntent_h
-#define _lxcmntent_h
+#ifndef _LXCMNTENT_H
+#define _LXCMNTENT_H
 
 #if IS_BIONIC
 struct mntent

src/include/openpty.h

@@ -21,8 +21,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _openpty_h
-#define _openpty_h
+#ifndef _OPENPTY_H
+#define _OPENPTY_H
 
 #include <termios.h>
 #include <sys/ioctl.h>

src/lxc/caps.h

@@ -21,11 +21,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __LXC_CAPS_H
+#define __LXC_CAPS_H
+
 #include "config.h"
 #include <stdbool.h>
 
-#ifndef __LXC_CAPS_H
-#define __LXC_CAPS_H
 
 #if HAVE_LIBCAP
 #include <sys/capability.h>

src/lxc/lsm/lsm.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __lxc_lsm_h
-#define __lxc_lsm_h
+#ifndef __LXC_LSM_H
+#define __LXC_LSM_H
 
 struct lxc_conf;