You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/06/03 19:25:55 UTC

[incubator-nuttx] 01/04: include/wchar.h: Remove NULL macro from it

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 7f3c540570a02431bfa1d1972658b13ac4e8343f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon May 30 20:01:36 2022 +0800

    include/wchar.h: Remove NULL macro from it
    
    since the same macro is defined in sys/types.h and
    the comment out macro definition in stdint.h
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 include/stdint.h | 15 ---------------
 include/wchar.h  |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/include/stdint.h b/include/stdint.h
index b5ac624d5a..ad07aad147 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -145,21 +145,6 @@
 #  define UINTMAX_C(x)      UINT32_C(x)
 #endif
 
-/* Limits of Other Integer Types */
-
-#if 0
-#  define                   PTRDIFF_MIN
-#  define                   PTRDIFF_MAX
-#endif
-
-#if 0
-#  define                   WCHAR_MIN
-#  define                   WCHAR_MAX
-
-#  define                   WINT_MIN
-#  define                   WINT_MAX
-#endif
-
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/include/wchar.h b/include/wchar.h
index 805d4de0c0..a61f36e78b 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -61,10 +61,6 @@
 #define WCHAR_MIN 0x0000
 #define WEOF      ((wint_t)-1)
 
-#ifndef NULL
-#  define NULL ((FAR void *)0)
-#endif
-
 #define wcsftime_l(s, m, f, t, l)   wcsftime(s, m, f, t)
 #define wcscasecmp_l(s1, s2, l)     wcscasecmp(s1, s2)
 #define wcsncasecmp_l(s1, s2, n, l) wcsncasecmp(s1, s2, n)