New header guards.

2005-02-21 07:39:58 +00:00
parent b5dcb0ac24
commit 27b299d932
56 changed files with 112 additions and 112 deletions
--- a/cpukit/itron/inline/rtems/itron/eventflags.inl
+++ b/cpukit/itron/inline/rtems/itron/eventflags.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_EVENTFLAGS_inl_
-#define __ITRON_EVENTFLAGS_inl_
+#ifndef _RTEMS_ITRON_EVENTFLAGS_INL
+#define _RTEMS_ITRON_EVENTFLAGS_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/fmempool.inl
+++ b/cpukit/itron/inline/rtems/itron/fmempool.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_FIXED_MEMORY_POOL_inl_
-#define __ITRON_FIXED_MEMORY_POOL_inl_
+#ifndef _RTEMS_ITRON_FMEMPOOL_INL
+#define _RTEMS_ITRON_FMEMPOOL_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/intr.inl
+++ b/cpukit/itron/inline/rtems/itron/intr.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_INTERRUPT_inl_
-#define __ITRON_INTERRUPT_inl_
+#ifndef _RTEMS_ITRON_INTR_INL
+#define _RTEMS_ITRON_INTR_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/mbox.inl
+++ b/cpukit/itron/inline/rtems/itron/mbox.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_MAILBOX_inl_
-#define __ITRON_MAILBOX_inl_
+#ifndef _RTEMS_ITRON_MBOX_INL
+#define _RTEMS_ITRON_MBOX_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/msgbuffer.inl
+++ b/cpukit/itron/inline/rtems/itron/msgbuffer.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_MESSAGE_BUFFER_inl_
-#define __ITRON_MESSAGE_BUFFER_inl_
+#ifndef _RTEMS_ITRON_MSGBUFFER_INL
+#define _RTEMS_ITRON_MSGBUFFER_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/network.inl
+++ b/cpukit/itron/inline/rtems/itron/network.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_NETWORK_inl_
-#define __ITRON_NETWORK_inl_
+#ifndef _RTEMS_ITRON_NETWORK_INL
+#define _RTEMS_ITRON_NETWORK_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/port.inl
+++ b/cpukit/itron/inline/rtems/itron/port.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_PORT_inl_
-#define __ITRON_PORT_inl_
+#ifndef _RTEMS_ITRON_PORT_INL
+#define _RTEMS_ITRON_PORT_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/semaphore.inl
+++ b/cpukit/itron/inline/rtems/itron/semaphore.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_SEMAPHORE_inl_
-#define __ITRON_SEMAPHORE_inl_
+#ifndef _RTEMS_ITRON_SEMAPHORE_INL
+#define _RTEMS_ITRON_SEMAPHORE_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/sysmgmt.inl
+++ b/cpukit/itron/inline/rtems/itron/sysmgmt.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_TIME_inl_
-#define __ITRON_TIME_inl_
+#ifndef _RTEMS_ITRON_SYSMGMT_INL
+#define _RTEMS_ITRON_SYSMGMT_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/task.inl
+++ b/cpukit/itron/inline/rtems/itron/task.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_TASK_inl_
-#define __ITRON_TASK_inl_
+#ifndef _RTEMS_ITRON_TASK_INL
+#define _RTEMS_ITRON_TASK_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/time.inl
+++ b/cpukit/itron/inline/rtems/itron/time.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_TIME_inl_
-#define __ITRON_TIME_inl_
+#ifndef _RTEMS_ITRON_TIME_INL
+#define _RTEMS_ITRON_TIME_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/inline/rtems/itron/vmempool.inl
+++ b/cpukit/itron/inline/rtems/itron/vmempool.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_VARIABLE_MEMORY_POOL_inl_
-#define __ITRON_VARIABLE_MEMORY_POOL_inl_
+#ifndef _RTEMS_ITRON_VMEMPOOL_INL
+#define _RTEMS_ITRON_VMEMPOOL_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/eventflags.inl
+++ b/cpukit/itron/macros/rtems/itron/eventflags.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_EVENTFLAGS_inl_
-#define __ITRON_EVENTFLAGS_inl_
+#ifndef _RTEMS_ITRON_EVENTFLAGS_INL
+#define _RTEMS_ITRON_EVENTFLAGS_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/fmempool.inl
+++ b/cpukit/itron/macros/rtems/itron/fmempool.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_FIXED_MEMORY_POOL_inl_
-#define __ITRON_FIXED_MEMORY_POOL_inl_
+#ifndef _RTEMS_ITRON_FMEMPOOL_INL
+#define _RTEMS_ITRON_FMEMPOOL_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/intr.inl
+++ b/cpukit/itron/macros/rtems/itron/intr.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_INTERRUPT_inl_
-#define __ITRON_INTERRUPT_inl_
+#ifndef _RTEMS_ITRON_INTR_INL
+#define _RTEMS_ITRON_INTR_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/mbox.inl
+++ b/cpukit/itron/macros/rtems/itron/mbox.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_MAILBOX_inl_
-#define __ITRON_MAILBOX_inl_
+#ifndef _RTEMS_ITRON_MBOX_INL
+#define _RTEMS_ITRON_MBOX_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/msgbuffer.inl
+++ b/cpukit/itron/macros/rtems/itron/msgbuffer.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_MESSAGE_BUFFER_inl_
-#define __ITRON_MESSAGE_BUFFER_inl_
+#ifndef _RTEMS_ITRON_MSGBUFFER_INL
+#define _RTEMS_ITRON_MSGBUFFER_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/network.inl
+++ b/cpukit/itron/macros/rtems/itron/network.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_NETWORK_inl_
-#define __ITRON_NETWORK_inl_
+#ifndef _RTEMS_ITRON_NETWORK_INL
+#define _RTEMS_ITRON_NETWORK_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/port.inl
+++ b/cpukit/itron/macros/rtems/itron/port.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_PORT_inl_
-#define __ITRON_PORT_inl_
+#ifndef _RTEMS_ITRON_PORT_INL
+#define _RTEMS_ITRON_PORT_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/semaphore.inl
+++ b/cpukit/itron/macros/rtems/itron/semaphore.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_SEMAPHORE_inl_
-#define __ITRON_SEMAPHORE_inl_
+#ifndef _RTEMS_ITRON_SEMAPHORE_INL
+#define _RTEMS_ITRON_SEMAPHORE_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/sysmgmt.inl
+++ b/cpukit/itron/macros/rtems/itron/sysmgmt.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_TIME_inl_
-#define __ITRON_TIME_inl_
+#ifndef _RTEMS_ITRON_SYSMGMT_INL
+#define _RTEMS_ITRON_SYSMGMT_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/task.inl
+++ b/cpukit/itron/macros/rtems/itron/task.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_TASK_inl_
-#define __ITRON_TASK_inl_
+#ifndef _RTEMS_ITRON_TASK_INL
+#define _RTEMS_ITRON_TASK_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/time.inl
+++ b/cpukit/itron/macros/rtems/itron/time.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_TIME_inl_
-#define __ITRON_TIME_inl_
+#ifndef _RTEMS_ITRON_TIME_INL
+#define _RTEMS_ITRON_TIME_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/itron/macros/rtems/itron/vmempool.inl
+++ b/cpukit/itron/macros/rtems/itron/vmempool.inl
@@ -13,8 +13,8 @@
 *  $Id$
 */

-#ifndef __ITRON_VARIABLE_MEMORY_POOL_inl_
-#define __ITRON_VARIABLE_MEMORY_POOL_inl_
+#ifndef _RTEMS_ITRON_VMEMPOOL_INL
+#define _RTEMS_ITRON_VMEMPOOL_INL

 #ifdef __cplusplus
 extern "C" {
--- a/cpukit/rtems/inline/rtems/rtems/asr.inl
+++ b/cpukit/rtems/inline/rtems/rtems/asr.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __INLINE_ASR_inl
-#define __INLINE_ASR_inl
+#ifndef _RTEMS_RTEMS_ASR_INL
+#define _RTEMS_RTEMS_ASR_INL

 #include <rtems/score/isr.h>

--- a/cpukit/rtems/inline/rtems/rtems/attr.inl
+++ b/cpukit/rtems/inline/rtems/rtems/attr.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __INLINE_ATTRIBUTES_inl
-#define __INLINE_ATTRIBUTES_inl
+#ifndef _RTEMS_RTEMS_ATTR_INL
+#define _RTEMS_RTEMS_ATTR_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/dpmem.inl
+++ b/cpukit/rtems/inline/rtems/rtems/dpmem.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __INLINE_DPMEM_inl
-#define __INLINE_DPMEM_inl
+#ifndef _RTEMS_RTEMS_DPMEM_INL
+#define _RTEMS_RTEMS_DPMEM_INL


 /*PAGE
--- a/cpukit/rtems/inline/rtems/rtems/event.inl
+++ b/cpukit/rtems/inline/rtems/rtems/event.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MACROS_EVENT_inl
-#define __MACROS_EVENT_inl
+#ifndef _RTEMS_RTEMS_EVENT_INL
+#define _RTEMS_RTEMS_EVENT_INL

 #endif
 /* end of include file */
--- a/cpukit/rtems/inline/rtems/rtems/eventset.inl
+++ b/cpukit/rtems/inline/rtems/rtems/eventset.inl
@@ -15,8 +15,8 @@
 *  $Id$
 */

-#ifndef __INLINE_EVENT_SET_inl
-#define __INLINE_EVENT_SET_inl
+#ifndef _RTEMS_RTEMS_EVENTSET_INL
+#define _RTEMS_RTEMS_EVENTSET_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/message.inl
+++ b/cpukit/rtems/inline/rtems/rtems/message.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MESSAGE_QUEUE_inl
-#define __MESSAGE_QUEUE_inl
+#ifndef _RTEMS_RTEMS_MESSAGE_INL
+#define _RTEMS_RTEMS_MESSAGE_INL

 #include <rtems/score/wkspace.h>

--- a/cpukit/rtems/inline/rtems/rtems/modes.inl
+++ b/cpukit/rtems/inline/rtems/rtems/modes.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MODES_inl
-#define __MODES_inl
+#ifndef _RTEMS_RTEMS_MODES_INL
+#define _RTEMS_RTEMS_MODES_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/options.inl
+++ b/cpukit/rtems/inline/rtems/rtems/options.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __OPTIONS_inl
-#define __OPTIONS_inl
+#ifndef _RTEMS_RTEMS_OPTIONS_INL
+#define _RTEMS_RTEMS_OPTIONS_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/part.inl
+++ b/cpukit/rtems/inline/rtems/rtems/part.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __PARTITION_inl
-#define __PARTITION_inl
+#ifndef _RTEMS_RTEMS_PART_INL
+#define _RTEMS_RTEMS_PART_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/ratemon.inl
+++ b/cpukit/rtems/inline/rtems/rtems/ratemon.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RATE_MONOTONIC_inl
-#define __RATE_MONOTONIC_inl
+#ifndef _RTEMS_RTEMS_RATEMON_INL
+#define _RTEMS_RTEMS_RATEMON_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/region.inl
+++ b/cpukit/rtems/inline/rtems/rtems/region.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __REGION_inl
-#define __REGION_inl
+#ifndef _RTEMS_RTEMS_REGION_INL
+#define _RTEMS_RTEMS_REGION_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/sem.inl
+++ b/cpukit/rtems/inline/rtems/rtems/sem.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __SEMAPHORE_inl
-#define __SEMAPHORE_inl
+#ifndef _RTEMS_RTEMS_SEM_INL
+#define _RTEMS_RTEMS_SEM_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/status.inl
+++ b/cpukit/rtems/inline/rtems/rtems/status.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __INLINE_STATUS_inl
-#define __INLINE_STATUS_inl
+#ifndef _RTEMS_RTEMS_STATUS_INL
+#define _RTEMS_RTEMS_STATUS_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/support.inl
+++ b/cpukit/rtems/inline/rtems/rtems/support.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */
 
-#ifndef __RTEMS_SUPPORT_inl
-#define __RTEMS_SUPPORT_inl
+#ifndef _RTEMS_RTEMS_SUPPORT_INL
+#define _RTEMS_RTEMS_SUPPORT_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/tasks.inl
+++ b/cpukit/rtems/inline/rtems/rtems/tasks.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_TASKS_inl
-#define __RTEMS_TASKS_inl
+#ifndef _RTEMS_RTEMS_TASKS_INL
+#define _RTEMS_RTEMS_TASKS_INL

 /*PAGE
 *
--- a/cpukit/rtems/inline/rtems/rtems/timer.inl
+++ b/cpukit/rtems/inline/rtems/rtems/timer.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __TIMER_inl
-#define __TIMER_inl
+#ifndef _RTEMS_RTEMS_TIMER_INL
+#define _RTEMS_RTEMS_TIMER_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/asr.inl
+++ b/cpukit/rtems/macros/rtems/rtems/asr.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MACROS_ASR_h
-#define __MACROS_ASR_h
+#ifndef _RTEMS_RTEMS_ASR_INL
+#define _RTEMS_RTEMS_ASR_INL

 #include <rtems/score/isr.h>

--- a/cpukit/rtems/macros/rtems/rtems/attr.inl
+++ b/cpukit/rtems/macros/rtems/rtems/attr.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MACROS_ATTRIBUTES_h
-#define __MACROS_ATTRIBUTES_h
+#ifndef _RTEMS_RTEMS_ATTR_INL
+#define _RTEMS_RTEMS_ATTR_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/dpmem.inl
+++ b/cpukit/rtems/macros/rtems/rtems/dpmem.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MACROS_DPMEM_h
-#define __MACROS_DPMEM_h
+#ifndef _RTEMS_RTEMS_DPMEM_INL
+#define _RTEMS_RTEMS_DPMEM_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/event.inl
+++ b/cpukit/rtems/macros/rtems/rtems/event.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MACROS_EVENT_h
-#define __MACROS_EVENT_h
+#ifndef _RTEMS_RTEMS_EVENT_INL
+#define _RTEMS_RTEMS_EVENT_INL

 #endif
 /* end of include file */
--- a/cpukit/rtems/macros/rtems/rtems/eventset.inl
+++ b/cpukit/rtems/macros/rtems/rtems/eventset.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __EVENT_SET_inl
-#define __EVENT_SET_inl
+#ifndef _RTEMS_RTEMS_EVENTSET_INL
+#define _RTEMS_RTEMS_EVENTSET_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/message.inl
+++ b/cpukit/rtems/macros/rtems/rtems/message.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MESSAGE_QUEUE_inl
-#define __MESSAGE_QUEUE_inl
+#ifndef _RTEMS_RTEMS_MESSAGE_INL
+#define _RTEMS_RTEMS_MESSAGE_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/modes.inl
+++ b/cpukit/rtems/macros/rtems/rtems/modes.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MODES_inl
-#define __MODES_inl
+#ifndef _RTEMS_RTEMS_MODES_INL
+#define _RTEMS_RTEMS_MODES_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/options.inl
+++ b/cpukit/rtems/macros/rtems/rtems/options.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __OPTIONS_inl
-#define __OPTIONS_inl
+#ifndef _RTEMS_RTEMS_OPTIONS_INL
+#define _RTEMS_RTEMS_OPTIONS_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/part.inl
+++ b/cpukit/rtems/macros/rtems/rtems/part.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __PARTITION_inl
-#define __PARTITION_inl
+#ifndef _RTEMS_RTEMS_PART_INL
+#define _RTEMS_RTEMS_PART_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/ratemon.inl
+++ b/cpukit/rtems/macros/rtems/rtems/ratemon.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RATE_MONOTONIC_inl
-#define __RATE_MONOTONIC_inl
+#ifndef _RTEMS_RTEMS_RATEMON_INL
+#define _RTEMS_RTEMS_RATEMON_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/region.inl
+++ b/cpukit/rtems/macros/rtems/rtems/region.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __REGION_inl
-#define __REGION_inl
+#ifndef _RTEMS_RTEMS_REGION_INL
+#define _RTEMS_RTEMS_REGION_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/sem.inl
+++ b/cpukit/rtems/macros/rtems/rtems/sem.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __SEMAPHORE_inl
-#define __SEMAPHORE_inl
+#ifndef _RTEMS_RTEMS_SEM_INL
+#define _RTEMS_RTEMS_SEM_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/status.inl
+++ b/cpukit/rtems/macros/rtems/rtems/status.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __MACROS_STATUS_h
-#define __MACROS_STATUS_h
+#ifndef _RTEMS_RTEMS_STATUS_INL
+#define _RTEMS_RTEMS_STATUS_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/support.inl
+++ b/cpukit/rtems/macros/rtems/rtems/support.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */
 
-#ifndef __RTEMS_SUPPORT_inl
-#define __RTEMS_SUPPORT_inl
+#ifndef _RTEMS_RTEMS_SUPPORT_INL
+#define _RTEMS_RTEMS_SUPPORT_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/tasks.inl
+++ b/cpukit/rtems/macros/rtems/rtems/tasks.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __RTEMS_TASKS_inl
-#define __RTEMS_TASKS_inl
+#ifndef _RTEMS_RTEMS_TASKS_INL
+#define _RTEMS_RTEMS_TASKS_INL

 /*PAGE
 *
--- a/cpukit/rtems/macros/rtems/rtems/timer.inl
+++ b/cpukit/rtems/macros/rtems/rtems/timer.inl
@@ -16,8 +16,8 @@
 *  $Id$
 */

-#ifndef __TIMER_inl
-#define __TIMER_inl
+#ifndef _RTEMS_RTEMS_TIMER_INL
+#define _RTEMS_RTEMS_TIMER_INL

 /*PAGE
 *