[cgma-dev] r3799 - cgm/trunk/itaps

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-04-21 14:09:44 -0500 (Wed, 21 Apr 2010)
New Revision: 3799

Modified:
   cgm/trunk/itaps/iBase.h
   cgm/trunk/itaps/iGeom.h
Log:
Replace #define ITAPS with #define _ITAPS_<interfacename>

Modified: cgm/trunk/itaps/iBase.h
===================================================================
--- cgm/trunk/itaps/iBase.h	2010-04-21 19:09:15 UTC (rev 3798)
+++ cgm/trunk/itaps/iBase.h	2010-04-21 19:09:44 UTC (rev 3799)
@@ -1,10 +1,6 @@
-#ifndef __IBASE_H__
-#define __IBASE_H__
+#ifndef _ITAPS_iBase
+#define _ITAPS_iBase
 
-#ifndef ITAPS
-#define ITAPS
-#endif
-
 #ifdef __cplusplus
 
 extern "C"
@@ -132,4 +128,4 @@
 }
 #endif
 
-#endif /* #ifndef __IBASE_H__ */
+#endif /* #ifndef _ITAPS_iBase */

Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h	2010-04-21 19:09:15 UTC (rev 3798)
+++ cgm/trunk/itaps/iGeom.h	2010-04-21 19:09:44 UTC (rev 3799)
@@ -1,5 +1,5 @@
-#ifndef IGEOM_CBIND_H__
-#define IGEOM_CBIND_H__
+#ifndef _ITAPS_iGeom
+#define _ITAPS_iGeom
 
   /** \mainpage The ITAPS Geometry Interface iGeom
    *
@@ -57,10 +57,6 @@
    *
    */
 
-#ifndef ITAPS
-#define ITAPS
-#endif
-
 #include "iBase.h"
 #include "iGeom_protos.h"
 #ifdef __cplusplus