[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 02/02: Rename win32-uname.[ch] to posix-w32.[ch]
From: |
Andy Wingo |
Subject: |
[Guile-commits] 02/02: Rename win32-uname.[ch] to posix-w32.[ch] |
Date: |
Mon, 11 Jul 2016 21:48:08 +0000 (UTC) |
wingo pushed a commit to branch stable-2.0
in repository guile.
commit 61b8794e040f033166901c2fc4c370651f495c2f
Author: Andy Wingo <address@hidden>
Date: Mon Jul 11 23:15:03 2016 +0200
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
(address@hidden@_la_SOURCES)
(noinst_HEADERS): Adapt.
---
libguile/Makefile.am | 4 ++--
libguile/{win32-uname.c => posix-w32.c} | 2 +-
libguile/{win32-uname.h => posix-w32.h} | 6 +++---
libguile/posix.c | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 4605037..cd85604 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -443,7 +443,7 @@ address@hidden@_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
@@ -490,7 +490,7 @@ uninstall-hook:
noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c \
srfi-14.i.c \
quicksort.i.c \
- win32-uname.h \
+ posix-w32.h \
private-gc.h private-options.h ports-internal.h
# vm instructions
diff --git a/libguile/win32-uname.c b/libguile/posix-w32.c
similarity index 99%
rename from libguile/win32-uname.c
rename to libguile/posix-w32.c
index 5349f14..f1251b2 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
similarity index 95%
rename from libguile/win32-uname.h
rename to libguile/posix-w32.h
index 4b74981..b4c6510 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 94489dc..6b4e72e 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
@@ -1426,10 +1430,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,
(),