1 files changed, 9 insertions, 34 deletions

diff --git a/openbsd-compat/port-irix.c b/openbsd-compat/port-irix.c
index aa6db1cf8..a63ec429a 100644
--- a/openbsd-compat/port-irix.c
+++ b/openbsd-compat/port-irix.c
@@ -1,42 +1,15 @@
-/*
- * Copyright (c) 2000 Denis Parker.  All rights reserved.
- * Copyright (c) 2000 Michael Stone.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 #include "includes.h"
 
-#if defined(WITH_IRIX_PROJECT) || \
-    defined(WITH_IRIX_JOBS) || \
-    defined(WITH_IRIX_ARRAY)
+#if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
 
 #ifdef WITH_IRIX_PROJECT
-# include <proj.h>
+#include <proj.h>
 #endif /* WITH_IRIX_PROJECT */
 #ifdef WITH_IRIX_JOBS
-# include <sys/resource.h>
+#include <sys/resource.h>
 #endif
 #ifdef WITH_IRIX_AUDIT
-# include <sat.h>
+#include <sat.h>
 #endif /* WITH_IRIX_AUDIT */
 
 void
@@ -44,12 +17,14 @@ irix_setusercontext(struct passwd *pw)
 {
 #ifdef WITH_IRIX_PROJECT
         prid_t projid;
-#endif
+#endif /* WITH_IRIX_PROJECT */
 #ifdef WITH_IRIX_JOBS
         jid_t jid = 0;
-#elif defined(WITH_IRIX_ARRAY)
+#else
+# ifdef WITH_IRIX_ARRAY
         int jid = 0;
-#endif
+# endif /* WITH_IRIX_ARRAY */
+#endif /* WITH_IRIX_JOBS */
 
 #ifdef WITH_IRIX_JOBS
         jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");