From 22261997429d2337e6ecec8806aedde3960e2c4f Mon Sep 17 00:00:00 2001 From: eeb Date: Wed, 28 Sep 2005 10:07:00 +0000 Subject: [PATCH] * minor build fixes for ulnds/ptllnd --- lnet/autoconf/lustre-lnet.m4 | 4 ++-- lnet/lnet/lib-eq.c | 2 ++ lnet/ulnds/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index e0f6ede..d883b19 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -126,10 +126,10 @@ fi AC_MSG_CHECKING([for usocklnd support]) if test x$enable_usocklnd = xyes ; then - AC_MSG_RESULT([no (by request)]) + AC_MSG_RESULT([yes]) USOCKLND="usocklnd" else - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([no (by request)]) USOCKLND="" fi AC_SUBST(USOCKLND) diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index ded9278..5347b0d 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -179,9 +179,11 @@ LNetEQPoll (lnet_handle_eq_t *eventqs, int neq, int timeout_ms, cfs_waitlink_t wl; cfs_time_t now; #else +# if !LNET_SINGLE_THREADED struct timeval then; struct timeval now; struct timespec ts; +# endif lnet_ni_t *ni; #endif ENTRY; diff --git a/lnet/ulnds/Makefile.in b/lnet/ulnds/Makefile.in index 7709619..39bb920 100644 --- a/lnet/ulnds/Makefile.in +++ b/lnet/ulnds/Makefile.in @@ -1,5 +1,5 @@ @BUILD_USOCKLND_TRUE@subdir-m += socklnd -subdir-m += ptllnd +@BUILD_PTLLND_TRUE@subdir-m += ptllnd @INCLUDE_RULES@ -- 1.8.3.1