VLP-28 Initial port to Qt4 of logker.

[vlp.git] / src / global / genint1.h

diff --git a/src/global/genint1.h b/src/global/genint1.h
index 60434b2aad96bc191a2e3064a5f0dd42f24bb80a..c098f2a1ed76ee5c71b650fdd9705fa3c19c60c4 100644 (file)
--- a/src/global/genint1.h
+++ b/src/global/genint1.h
@@ -28,6 +28,9 @@ or             Andrzej Salwicki
 =======================================================================
 */
 
+#ifndef __GENINT_H
+#define __GENINT_H
+
 #if GEN
 #define word address
 #endif
@@ -67,8 +70,14 @@ or             Andrzej Salwicki
 typedef int bool;
 #endif
 
+/* In Qt4 these 2 definitions are already made */
+#ifndef FALSE
 #define FALSE           0
+#endif
+
+#ifndef TRUE
 #define TRUE            1
+#endif
 
 
 /* Values identifying types and formal parameters: */
@@ -149,7 +158,7 @@ typedef int protkind;
 #endif
 
 /* TODO: Conditionally restore it:*/
-/*typedef int word;*/
+typedef int word;
 
 /**
  * Prototype:
@@ -251,3 +260,5 @@ typedef struct {
 } protdescr,*pointprdsc;
 
 /** @} */
+
+#endif /* __GENINT_H */