From: Ryan Dahl <ry@tinyclouds.org>
Date: Tue, 11 Jan 2011 22:13:06 +0000 (-0800)
Subject: Merge branch 'vanilla-libeio'
X-Git-Tag: v0.3.5~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=464f5d4e13ab5feff085be41011c8e478ac63ef8;p=platform%2Fupstream%2Fnodejs.git

Merge branch 'vanilla-libeio'

Conflicts:
	deps/libeio/config.h.in
---

464f5d4e13ab5feff085be41011c8e478ac63ef8
diff --cc deps/libeio/config.h.in
index 3d66885,ffd8b9c..73e9dd0
--- a/deps/libeio/config.h.in
+++ b/deps/libeio/config.h.in
@@@ -48,5 -54,36 +54,33 @@@
  /* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H
  
+ /* utimes(2) is available */
+ #undef HAVE_UTIMES
+ 
+ /* Define to the sub-directory in which libtool stores uninstalled libraries.
+    */
+ #undef LT_OBJDIR
+ 
+ /* Name of package */
+ #undef PACKAGE
+ 
+ /* Define to the address where bug reports for this package should be sent. */
+ #undef PACKAGE_BUGREPORT
+ 
+ /* Define to the full name of this package. */
+ #undef PACKAGE_NAME
+ 
+ /* Define to the full name and version of this package. */
+ #undef PACKAGE_STRING
+ 
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+ 
+ /* Define to the home page for this package. */
+ #undef PACKAGE_URL
+ 
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
 -
 -/* Version number of package */
 -#undef VERSION