summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-09-04 20:28:31 +0000
committerjoeh <joeh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-09-04 20:28:31 +0000
commita5a1e725e4fc50b53b9940cfc57be99e16dff042 (patch)
treedd46de1c8b305d5d062a5d363b9e8e68a917ab1f
parent2a503537c52bac0df35ddc7c44408d00b24b2671 (diff)
downloadATCD-a5a1e725e4fc50b53b9940cfc57be99e16dff042.tar.gz
ChangeLogTag: Tue Sep 4 15:26:46 2001 Joe Hoffert <joeh@cs.wustl.edu>
-rw-r--r--PACE/ChangeLog9
-rw-r--r--PACE/tests/Cond_Var_Test.c3
-rw-r--r--PACE/tests/Makefile2
3 files changed, 11 insertions, 3 deletions
diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index ee376cca889..9473f1967c2 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,12 @@
+Tue Sep 4 15:26:46 2001 Joe Hoffert <joeh@cs.wustl.edu>
+
+ * tests/Cond_Var_Test.c:
+ Cleanup up unused variables and signed type on argc.
+
+ * tests/Makefile:
+ Corrected inclusion of BIN2 - executables that aren't
+ always included - for non VxWorks platforms.
+
Tue Sep 4 09:15:00 2001 Joe Hoffert <joeh@cs.wustl.edu>
* tests/Pthreads_Test.c:
diff --git a/PACE/tests/Cond_Var_Test.c b/PACE/tests/Cond_Var_Test.c
index 017b5fea0b5..fe6d0a646f1 100644
--- a/PACE/tests/Cond_Var_Test.c
+++ b/PACE/tests/Cond_Var_Test.c
@@ -78,7 +78,6 @@ void *inc_count(void *idp)
void *watch_count(void *idp)
{
- int i = 0;
int *my_id = idp;
pace_pthread_t pthread;
@@ -106,7 +105,7 @@ void *watch_count(void *idp)
}
int
-main(unsigned int argc, char *argv[])
+main(int argc, char *argv[])
{
unsigned int i;
pace_pthread_t threads[3];
diff --git a/PACE/tests/Makefile b/PACE/tests/Makefile
index 7e6a661665b..6a40107a5f4 100644
--- a/PACE/tests/Makefile
+++ b/PACE/tests/Makefile
@@ -36,7 +36,7 @@ ifdef VXWORKS
ACELIB += -lPACE
LDFLAGS += -L$(PACE_ROOT)/pace/
else
- BIN += BIN2
+ BIN += $(BIN2)
endif
INCLDIRS += -I$(PACE_ROOT)
include $(ACE_ROOT)/include/makeinclude/macros.GNU