From 0feb9db220a276a2f8f29621dc8f04072bbfdd22 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Apr 2024 21:39:01 +0200
Subject: Merging upstream version 2.12.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 gl/lib/opendir.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'gl/lib/opendir.c')

diff --git a/gl/lib/opendir.c b/gl/lib/opendir.c
index ceb0e28..df76807 100644
--- a/gl/lib/opendir.c
+++ b/gl/lib/opendir.c
@@ -1,5 +1,5 @@
 /* Start reading the entries of a directory.
-   Copyright (C) 2006-2023 Free Software Foundation, Inc.
+   Copyright (C) 2006-2024 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
@@ -44,11 +44,6 @@
 # include <unistd.h>
 #endif
 
-#ifdef __KLIBC__
-# include <io.h>
-# include <fcntl.h>
-#endif
-
 #if defined _WIN32 && ! defined __CYGWIN__
 /* Don't assume that UNICODE is not defined.  */
 # undef WIN32_FIND_DATA
@@ -93,23 +88,6 @@ opendir (const char *dir_name)
     return NULL;
 # endif
 
-# ifdef __KLIBC__
-  {
-    int fd = open (dir_name, O_RDONLY);
-    if (fd == -1 || _gl_register_dirp_fd (fd, dirp))
-      {
-        int saved_errno = errno;
-
-        close (fd);
-        closedir (dirp);
-
-        errno = saved_errno;
-
-        return NULL;
-      }
-  }
-# endif
-
 #else
 
   char dir_name_mask[MAX_PATH + 1 + 1 + 1];
-- 
cgit v1.2.3