Changeset 3238 in orxonox.OLD for orxonox/branches/sound/src/error.h

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/sound/src/error.h (modified) (2 diffs)

orxonox/branches/sound/src/error.h

@@ -22 +22 @@
 */ 
 
-// this are the two undefined error nr. Don't use them ...
-#define ERROR -1
-#define NERROR 0
+
+#ifndef _ERROR_H
+#define _ERROR_H
+
+// these are the two undefined error nr. Don't use them ...
+#define oERROR -1
+
+#define oNOERROR 0
 
 /*!
@@ -54 +59 @@
   char* message;
   char* location;
-} Error;
+} ErrorMessage;
+
+#endif /* _ERROR_H */