diff options
| author | Andy Wingo <wingo@pobox.com> | 2016-07-11 23:15:03 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2016-07-25 11:41:50 +0200 |
| commit | b2d77c38c45794541e46c235517369a4c8b75d3b (patch) | |
| tree | 52e31c68449066d909e0042e4d59508d7cc8b967 | |
| parent | d32f37e56ca4b0753e75f465f3e60dac5e9a3416 (diff) | |
Rename win32-uname.[ch] to posix-w32.[ch]
* libguile/posix-w32.c:
* libguile/posix-w32.h: Rename from win32-uname.c and win32-uname.h.
* libguile/posix.c:
* libguile/Makefile.am
(EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES)
(noinst_HEADERS): Adapt.
| -rw-r--r-- | libguile/Makefile.am | 6 | ||||
| -rw-r--r-- | libguile/posix-w32.c (renamed from libguile/win32-uname.c) | 2 | ||||
| -rw-r--r-- | libguile/posix-w32.h (renamed from libguile/win32-uname.h) | 6 | ||||
| -rw-r--r-- | libguile/posix.c | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 855a57faa..dab09e1a3 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with Automake to create Makefile.in ## ## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, -## 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. +## 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -456,7 +456,7 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \ dynl.c regex-posix.c \ posix.c net_db.c socket.c \ debug-malloc.c \ - win32-uname.c \ + posix-w32.c \ locale-categories.h ## delete guile-snarf.awk from the installation bindir, in case it's @@ -504,7 +504,7 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c \ elf.h \ srfi-14.i.c \ quicksort.i.c \ - win32-uname.h \ + posix-w32.h \ private-options.h ports-internal.h # vm instructions diff --git a/libguile/win32-uname.c b/libguile/posix-w32.c index 5349f1410..f1251b22d 100644 --- a/libguile/win32-uname.c +++ b/libguile/posix-w32.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <string.h> -#include "win32-uname.h" +#include "posix-w32.h" /* * Get name and information about current kernel. diff --git a/libguile/win32-uname.h b/libguile/posix-w32.h index 4b7498133..b4c6510eb 100644 --- a/libguile/win32-uname.h +++ b/libguile/posix-w32.h @@ -1,7 +1,7 @@ /* classes: h_files */ -#ifndef SCM_WIN32_UNAME_H -#define SCM_WIN32_UNAME_H +#ifndef SCM_POSIX_W32_H +#define SCM_POSIX_W32_H /* Copyright (C) 2001, 2006 Free Software Foundation, Inc. * @@ -49,4 +49,4 @@ struct utsname int uname (struct utsname * uts); -#endif /* SCM_WIN32_UNAME_H */ +#endif /* SCM_POSIX_W32_H */ diff --git a/libguile/posix.c b/libguile/posix.c index 8b3fabc03..72f105f4b 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -81,6 +81,10 @@ #include "libguile/threads.h" +#ifdef __MINGW32__ +# include "posix-w32.h" +#endif + #if HAVE_SYS_WAIT_H # include <sys/wait.h> #endif @@ -1427,10 +1431,6 @@ scm_open_process (SCM mode, SCM prog, SCM args) #undef FUNC_NAME #endif /* HAVE_START_CHILD */ -#ifdef __MINGW32__ -# include "win32-uname.h" -#endif - #if defined (HAVE_UNAME) || defined (__MINGW32__) SCM_DEFINE (scm_uname, "uname", 0, 0, 0, (), |