From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/exec/posix/inline/rtems/posix/Makefile.am | 12 +++++-------
 c/src/exec/posix/inline/rtems/posix/cond.inl    |  9 ++++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'c/src/exec/posix/inline/rtems')

diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.am b/c/src/exec/posix/inline/rtems/posix/Makefile.am
index 89b3c87d3b..a38f1fa8f1 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/inline/rtems/posix/Makefile.am
@@ -3,16 +3,16 @@
 ##
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 #I_FILES= intr.inl
 I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
-   semaphore.inl
+    semaphore.inl
 
 noinst_HEADERS = $(I_FILES)
 
 if INLINE
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/posix \
-$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
+    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
 
 $(PROJECT_INCLUDE)/rtems/posix:
 	@$(mkinstalldirs) $@
@@ -20,9 +20,7 @@ $(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl
 	$(INSTALL_DATA) $< $@
 endif
 
-all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = intr.inl
 
diff --git a/c/src/exec/posix/inline/rtems/posix/cond.inl b/c/src/exec/posix/inline/rtems/posix/cond.inl
index d718ef514f..19d5c6ec4b 100644
--- a/c/src/exec/posix/inline/rtems/posix/cond.inl
+++ b/c/src/exec/posix/inline/rtems/posix/cond.inl
@@ -53,10 +53,13 @@ RTEMS_INLINE_ROUTINE POSIX_Condition_variables_Control *_POSIX_Condition_variabl
   Objects_Locations *location
 )
 {
-/* XXX really should validate pointer */
 /* XXX should support COND_INITIALIZER */
-  return (POSIX_Condition_variables_Control *)
-    _Objects_Get( &_POSIX_Condition_variables_Information, *id, location );
+  if ( id )
+    return (POSIX_Condition_variables_Control *)
+      _Objects_Get( &_POSIX_Condition_variables_Information, *id, location );
+
+  *location = OBJECTS_ERROR;
+  return NULL;
 }
  
 /*PAGE
-- 
cgit v1.2.3