Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

[gnu-emacs] / nt / config.nt

diff --git a/nt/config.nt b/nt/config.nt
index d612a417f4dc896826d604e8a70fa3e81659e7c0..26fbc1c67c5be0f400663f13f6e42bb447f75854 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -340,6 +340,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* If using GNU, then support inline function declarations. */
 #ifdef __GNUC__
 #define INLINE __inline__
+#define inline __inline__
 #else
 #define INLINE
 #endif
@@ -410,6 +411,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define my_strftime nstrftime   /* for strftime.c */
 
+/* Define to the type of st_nlink in struct stat, or a supertype. */
+#define nlink_t short
+
 #ifndef WINDOWSNT
 /* Some of the files of Emacs which are intended for use with other
    programs assume that if you have a config.h file, you must declare