Add conditional definition for MIN macro needed in last commit

This commit is contained in:
Gregory Nutt
2015-07-05 09:08:45 -06:00
parent fc5281e2a1
commit 5f2a181599
2 changed files with 10 additions and 2 deletions
+1 -1
Submodule configs updated: 011c54d78c...ef0ed726cc
+9 -1
View File
@@ -71,6 +71,14 @@
# define CONFIG_NET_HOSTNAME "" # define CONFIG_NET_HOSTNAME ""
#endif #endif
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
@@ -150,7 +158,7 @@ int sethostname(FAR const char *name, size_t size)
irqstate_t flags; irqstate_t flags;
/* Save the new host name, truncating to HOST_NAME_MAX if necessary. This /* Save the new host name, truncating to HOST_NAME_MAX if necessary. This
* internal copy is always NUL terminated .The hostname is global resource. * internal copy is always NUL terminated. The hostname is global resource.
* There is a microscopic possibility that it could be accessed while we * There is a microscopic possibility that it could be accessed while we
* are setting it. * are setting it.
*/ */