changeset 3682:6d8011b743b1

. Fix a merge error.
author Greg Lewis <glewis@eyesbeyond.com>
date Thu, 03 Mar 2011 18:41:27 -0800
parents 72291b68ff38
children 4a5206f2e710
files make/java/nio/Makefile
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/java/nio/Makefile	Thu Mar 03 18:41:01 2011 -0800
+++ b/make/java/nio/Makefile	Thu Mar 03 18:41:27 2011 -0800
@@ -354,7 +354,7 @@
      $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \
      $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \
      $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj
-else
+endif
 ifeq ($(PLATFORM), linux)
 OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
 endif