aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-14 16:01:28 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-14 16:01:28 +0000
commit887063f44b21a9e7b2b1e7525de61d517474659f (patch)
treeba13a91ac88a6fcc267414367a49cc9a5fdeacaf
parentd19cda5fa6a0f5a1395c47603e21d8db219c8280 (diff)
downloadruby-887063f44b21a9e7b2b1e7525de61d517474659f.tar.gz
fix mswin32 build error.
* missing/setproctitle.c: oadd #ifdef HAVE_UNISTD_H. * win32/Makefile.sub (MISSING): add setproctitle.obj git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--missing/setproctitle.c2
-rw-r--r--win32/Makefile.sub2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c0b7d37478..19eb45f9a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun May 15 00:58:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ fix mswin32 build error.
+
+ * missing/setproctitle.c: oadd #ifdef HAVE_UNISTD_H.
+ * win32/Makefile.sub (MISSING): add setproctitle.obj
+
Sat May 14 22:45:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* missing/setproctitle.c: add to include "ruby/util.h".
diff --git a/missing/setproctitle.c b/missing/setproctitle.c
index a9b4fbe825..f4078bd993 100644
--- a/missing/setproctitle.c
+++ b/missing/setproctitle.c
@@ -39,7 +39,9 @@
#include <stdarg.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#ifdef HAVE_SYS_PSTAT_H
#include <sys/pstat.h>
#endif
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 766f934081..4dd7b7993e 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -221,7 +221,7 @@ LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib imagehlp.lib
LIBS = unicows.lib $(LIBS)
!endif
!if !defined(MISSING)
-MISSING = acosh.obj cbrt.obj crypt.obj erf.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj
+MISSING = acosh.obj cbrt.obj crypt.obj erf.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj setproctitle.obj
!endif
ARFLAGS = -machine:$(MACHINE) -out: