guile/guile-core/libguile posix.c

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 01/11/01 19:16:46

Modified files:
        guile-core/libguile: posix.c 

Log message:
        Remove unnecessary dirent includes and defines. Include
        local `win32-uname.h' for MinGW.  Extern declaration of
        `mkstemp()' for systems where it does not exists.  Make
        `getlogin()' available on M$-Windows.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/posix.c.diff?cvsroot=OldCVS&tr1=1.94&tr2=1.95&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/posix.c
diff -u guile/guile-core/libguile/posix.c:1.94 
guile/guile-core/libguile/posix.c:1.95
--- guile/guile-core/libguile/posix.c:1.94      Fri Aug 31 10:42:31 2001
+++ guile/guile-core/libguile/posix.c   Thu Nov  1 19:16:46 2001
@@ -126,23 +126,6 @@
 #include <sys/utsname.h>
 #endif
 
-#if HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif
@@ -993,8 +976,12 @@
 }
 #undef FUNC_NAME
 #endif /* HAVE_FORK */
+
+#ifdef __MINGW32__
+# include "win32-uname.h"
+#endif
 
-#ifdef HAVE_UNAME
+#if defined (HAVE_UNAME) || defined (__MINGW32__)
 SCM_DEFINE (scm_uname, "uname", 0, 0, 0,
             (),
            "Return an object with some information about the computer\n"
@@ -1082,6 +1069,10 @@
 
 #endif
 
+#ifndef HAVE_MKSTEMP
+extern int mkstemp (char *);
+#endif
+
 SCM_DEFINE (scm_mkstemp, "mkstemp!", 1, 0, 0,
            (SCM tmpl),
            "Create a new unique file in the file system and returns a new\n"
@@ -1385,7 +1376,7 @@
 #endif /* __MINGW32__ */
 
 
-#if HAVE_GETLOGIN
+#if defined (HAVE_GETLOGIN) || defined (__MINGW32__)
 SCM_DEFINE (scm_getlogin, "getlogin", 0, 0, 0, 
             (void),
            "Return a string containing the name of the user logged in on\n"