diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-07 12:35:24 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-07 12:35:24 -0600 |
| commit | 6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458 (patch) | |
| tree | d1f3f6268bff752463cec686ca851f7b0f619051 /apps/examples/ostest | |
| parent | c029edd96276fe7efa15992a5dd0da47920a2adb (diff) | |
| download | nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.tar.gz nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.tar.bz2 nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.zip | |
Remove CONFIG_DISABLE_CLOCK
Diffstat (limited to 'apps/examples/ostest')
| -rw-r--r-- | apps/examples/ostest/Makefile | 9 | ||||
| -rw-r--r-- | apps/examples/ostest/ostest_main.c | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile index d0f347dfb..71b08a942 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/examples/ostest/Makefile # -# Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -69,18 +69,13 @@ endif # CONFIG_DISABLE_PTHREAD ifneq ($(CONFIG_DISABLE_SIGNALS),y) CSRCS += sighand.c ifneq ($(CONFIG_DISABLE_PTHREAD),y) -ifneq ($(CONFIG_DISABLE_CLOCK),y) CSRCS += timedwait.c -endif # CONFIG_DISABLE_CLOCK endif # CONFIG_DISABLE_PTHREAD endif # CONFIG_DISABLE_SIGNALS ifneq ($(CONFIG_DISABLE_MQUEUE),y) ifneq ($(CONFIG_DISABLE_PTHREAD),y) -CSRCS += mqueue.c -ifneq ($(CONFIG_DISABLE_CLOCK),y) -CSRCS += timedmqueue.c -endif # CONFIG_DISABLE_CLOCK +CSRCS += mqueue.c timedmqueue.c endif # CONFIG_DISABLE_PTHREAD endif # CONFIG_DISABLE_MQUEUE diff --git a/apps/examples/ostest/ostest_main.c b/apps/examples/ostest/ostest_main.c index 8591c5f3f..a234e50e6 100644 --- a/apps/examples/ostest/ostest_main.c +++ b/apps/examples/ostest/ostest_main.c @@ -1,7 +1,7 @@ /**************************************************************************** * apps/examples/ostest/ostest_main.c * - * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -387,7 +387,7 @@ static int user_main(int argc, char *argv[]) #endif #endif -#if !defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_DISABLE_PTHREAD) && !defined(CONFIG_DISABLE_CLOCK) +#if !defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_DISABLE_PTHREAD) /* Verify pthreads and condition variable timed waits */ printf("\nuser_main: timed wait test\n"); @@ -403,7 +403,7 @@ static int user_main(int argc, char *argv[]) check_test_memory_usage(); #endif -#if !defined(CONFIG_DISABLE_MQUEUE) && !defined(CONFIG_DISABLE_PTHREAD) && !defined(CONFIG_DISABLE_CLOCK) +#if !defined(CONFIG_DISABLE_MQUEUE) && !defined(CONFIG_DISABLE_PTHREAD) /* Verify pthreads and message queues */ printf("\nuser_main: timed message queue test\n"); |