merged with mastercheck_snmp_fixes

1 files changed, 3 insertions, 9 deletions

diff --git a/gl/open.c b/gl/open.c
index d76372fd..c3b5648e 100644
--- a/gl/open.c
+++ b/gl/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2025 Free Software Foundation, Inc.
+   Copyright (C) 2007-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -38,13 +38,7 @@ orig_open (const char *filename, int flags, mode_t mode)
 }
 
 /* Specification.  */
-#ifdef __osf__
-/* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
-   this include because of the preliminary #include <fcntl.h> above.  */
-# include "fcntl.h"
-#else
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #include "cloexec.h"
 
@@ -100,7 +94,7 @@ open (const char *filename, int flags, ...)
 #endif
 
 #if defined _WIN32 && ! defined __CYGWIN__
-  if (strcmp (filename, "/dev/null") == 0)
+  if (streq (filename, "/dev/null"))
     filename = "NUL";
 #endif