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 /nuttx/net/utils | |
| parent | c029edd96276fe7efa15992a5dd0da47920a2adb (diff) | |
| download | px4-nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.tar.gz px4-nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.tar.bz2 px4-nuttx-6c1d3a968a290e3d09cfc62cdc1a0257d4d4f458.zip | |
Remove CONFIG_DISABLE_CLOCK
Diffstat (limited to 'nuttx/net/utils')
| -rw-r--r-- | nuttx/net/utils/net_timeval2dsec.c | 3 | ||||
| -rw-r--r-- | nuttx/net/utils/utils.h | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/nuttx/net/utils/net_timeval2dsec.c b/nuttx/net/utils/net_timeval2dsec.c index 12fafab7f..78c250867 100644 --- a/nuttx/net/utils/net_timeval2dsec.c +++ b/nuttx/net/utils/net_timeval2dsec.c @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#if defined(CONFIG_NET) && !defined(CONFIG_DISABLE_CLOCK) #include <nuttx/clock.h> @@ -69,5 +68,3 @@ unsigned int net_timeval2dsec(struct timeval *tv) { return (unsigned int)(tv->tv_sec * DSEC_PER_SEC + tv->tv_usec / USEC_PER_DSEC); } - -#endif /* CONFIG_NET && !CONFIG_DISABLE_CLOCK */ diff --git a/nuttx/net/utils/utils.h b/nuttx/net/utils/utils.h index e3e640c1d..6ecb47ce6 100644 --- a/nuttx/net/utils/utils.h +++ b/nuttx/net/utils/utils.h @@ -67,9 +67,7 @@ extern "C" ****************************************************************************/ struct net_driver_s; /* Forward reference */ -#if !defined(CONFIG_DISABLE_CLOCK) struct timeval; /* Forward reference */ -#endif /**************************************************************************** * Function: net_lockinitialize @@ -103,9 +101,7 @@ void net_lockinitialize(void); * ****************************************************************************/ -#if !defined(CONFIG_DISABLE_CLOCK) void net_dsec2timeval(uint16_t dsec, FAR struct timeval *tv); -#endif /**************************************************************************** * Function: net_dsec2tick @@ -140,9 +136,7 @@ unsigned int net_dsec2tick(int dsec); * ****************************************************************************/ -#if !defined(CONFIG_DISABLE_CLOCK) unsigned int net_timeval2dsec(FAR struct timeval *tv); -#endif /**************************************************************************** * Name: tcp_chksum |