diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-27 10:49:27 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-27 10:49:27 -0600 |
| commit | 4f7347955eb8b544d1c7910e4141b4a9865b3d85 (patch) | |
| tree | e37a1f535921bb98acdc1dcc3636d15d6a71905a | |
| parent | faafcf1b588c9874f1369236d4a1601ccd5bbbe4 (diff) | |
| download | nuttx-4f7347955eb8b544d1c7910e4141b4a9865b3d85.tar.gz nuttx-4f7347955eb8b544d1c7910e4141b4a9865b3d85.tar.bz2 nuttx-4f7347955eb8b544d1c7910e4141b4a9865b3d85.zip | |
Fixing bad idempotence definition in C++ header files
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/include/cxx/cstddef | 8 | ||||
| -rw-r--r-- | nuttx/include/cxx/cstdio | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index f99ed1713..96f760b1f 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6671,3 +6671,6 @@ * arch/arm/src/sama5/sam_adc.h: Fix typos in the SAMA5 ADC register definition header file (2014-2-26). * arch/arm/src/sam34: The port to the SAM4E is code complete (2014-2-16). + * include/cxx: Fix some bad idempotence defintions in header files + (2014-2-27). + diff --git a/nuttx/include/cxx/cstddef b/nuttx/include/cxx/cstddef index 73dbcd526..74811d830 100644 --- a/nuttx/include/cxx/cstddef +++ b/nuttx/include/cxx/cstddef @@ -1,7 +1,7 @@ //*************************************************************************** // include/cxx/cstddef // -// Copyright (C) 2009 Gregory Nutt. All rights reserved. +// Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved. // Author: Gregory Nutt <gnutt@nuttx.org> // // Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ // //*************************************************************************** -#ifndef __INCLUDE_CXX_CCTYPE -#define __INCLUDE_CXX_CCTYPE +#ifndef __INCLUDE_CXX_CSTDDEF +#define __INCLUDE_CXX_CSTDDEF //*************************************************************************** // Included Files @@ -78,4 +78,4 @@ namespace std using ::sa_family_t; } -#endif // __INCLUDE_CXX_CCTYPE +#endif // __INCLUDE_CXX_CSTDDEF diff --git a/nuttx/include/cxx/cstdio b/nuttx/include/cxx/cstdio index 6a9620e1a..ff64f5919 100644 --- a/nuttx/include/cxx/cstdio +++ b/nuttx/include/cxx/cstdio @@ -1,7 +1,7 @@ //*************************************************************************** // include/cxx/cstdio // -// Copyright (C) 2009 Gregory Nutt. All rights reserved. +// Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved. // Author: Gregory Nutt <gnutt@nuttx.org> // // Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ // //*************************************************************************** -#ifndef __INCLUDE_CXX_CCTYPE -#define __INCLUDE_CXX_CCTYPE +#ifndef __INCLUDE_CXX_CSTDIO +#define __INCLUDE_CXX_CSTDIO //*************************************************************************** // Included Files @@ -93,4 +93,4 @@ namespace std using ::statfs; } -#endif // __INCLUDE_CXX_CCTYPE +#endif // __INCLUDE_CXX_CSTDIO |