From 9d50b2008995ed5fdb6b4e4392fbbee6464905a4 Mon Sep 17 00:00:00 2001
From: Maurilio Longo <maurilio.longo@libero.it>
Date: Wed, 2 Aug 2000 11:04:22 +0000
Subject: [PATCH] 20000802-12:58 GMT+2 Maurilio Longo
 <maurilio.longo@libero.it>

---
 harbour/ChangeLog                 | 12 ++++++++++
 harbour/config/c.cf               | 38 +++++++++++++++++++++++++++++++
 harbour/source/compiler/simplex.c |  4 ++++
 harbour/source/macro/Makefile     |  3 ++-
 harbour/source/macro/macroslx.c   |  6 +++++
 5 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 623ed609b7..b458eb44fc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,15 @@
+20000802-12:58 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
+   * source/compiler/simplex.c
+     + added missing id tag
+   * source/macro/macroslx.c
+     + added #define yylex hb_complex to make it compile under OS/2 GCC. PLEASE NOTE that I DON'T KNOW
+       why it works and why it is required here but not in hbslex.c. hbtest has one failure less than compiled
+       with flex so I shouldn't be creating problems with this change.
+   * source/macro/Makefile
+     * changed while trying to make macroslx.c works.
+   * config/c.cf
+     * changed while trying to make macroslx.c works.
+
 2000-08-01 20:15 UTC+0800 Ron Pinkas <ron@profit-master.com>
    * include/hberrors.h
      + Added: #define HB_PP_ERR_INCLUDE_SELF                  17
diff --git a/harbour/config/c.cf b/harbour/config/c.cf
index 85d94a9110..f512992483 100644
--- a/harbour/config/c.cf
+++ b/harbour/config/c.cf
@@ -1,37 +1,75 @@
 #
+
 # $Id$
+
 #
 
+
+
 C_OBJS = $(C_SOURCES:.c=$(OBJ_EXT))
 
+
+
 C_MAIN_OBJ = $(C_MAIN:.c=$(OBJ_EXT))
 
+
+
 ifdef YACC_SOURCE
+
 YACC_BASE = $(YACC_SOURCE:.y=)
+
 YACC_C = $(YACC_BASE)y.c
+
 YACC_H_TMP = $(YACC_C:.c=.h)
+
 YACC_H = y_tab.h
+
 YACC_OUTPUT = $(YACC_C:.c=.out)
+
 YACC_OBJ = $(YACC_C:.c=$(OBJ_EXT))
+
 YACC_HB_H := $(foreach h, $(YACC_HEADERS), $(HB_INC_COMPILE)/$(h))
+
 endif
 
+
+
 ifdef LEX_SOURCE
+
 LEX_BASE = $(LEX_SOURCE:.l=)
+
 LEX_C = $(LEX_BASE)l.c
+
 LEX_OBJ = $(LEX_C:.c=$(OBJ_EXT))
+
 LEX_HB_H := $(foreach h, $(LEX_HEADERS), $(HB_INC_COMPILE)/$(h))
+
 endif
 
+
+
 ALL_C_OBJS = $(YACC_OBJ) $(LEX_OBJ) $(C_OBJS) $(C_MAIN_OBJ)
 
+
+
 $(YACC_OBJ) : $(YACC_C)
 
+
+
 $(YACC_C) : ../../$(YACC_SOURCE) $(YACC_HB_H)
+
 	$(YACC) $(YACC_FLAGS) -o$@ $<
 
 
+
+
+
 $(LEX_OBJ) : $(LEX_C)
 
+
+
 $(LEX_C) : ../../$(LEX_SOURCE) $(LEX_HB_H)
+
 	$(LEX) $(LEX_FLAGS) -o$@ $<
+
+
\ No newline at end of file
diff --git a/harbour/source/compiler/simplex.c b/harbour/source/compiler/simplex.c
index d653f73977..89c517133c 100644
--- a/harbour/source/compiler/simplex.c
+++ b/harbour/source/compiler/simplex.c
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 /*
  * Copyright 2000 Ron Pinkas <ron@profit-master.com>
  * www - http://www.Profit-Master.com
diff --git a/harbour/source/macro/Makefile b/harbour/source/macro/Makefile
index dc5ef4050d..5e887f074b 100644
--- a/harbour/source/macro/Makefile
+++ b/harbour/source/macro/Makefile
@@ -42,10 +42,11 @@ LEX_HEADERS=\
 endif
 
 C_SOURCES=\
+	$(C_EXTRA) \
 	macroa.c \
 	macrob.c \
 	macroc.c \
-	$(C_EXTRA)
+
 
 LIBNAME=macro
 
diff --git a/harbour/source/macro/macroslx.c b/harbour/source/macro/macroslx.c
index 3badbde043..6751225cf1 100644
--- a/harbour/source/macro/macroslx.c
+++ b/harbour/source/macro/macroslx.c
@@ -5,6 +5,11 @@
 
 #define HB_MACRO_SUPPORT
 
+/* NOTE: 02/08/2000 - maurilio.longo@libero.it, I DON'T KNOW why I need this define to make it work under
+         OS/2 GCC. :-D
+*/
+#define yylex hb_complex
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,6 +23,7 @@
 #include "hberrors.h"
 #include "hbdefs.h"
 
+/* NOTE: 02/08/2000 - maurilio.longo@libero.it, under OS/2 GCC I need to use relative paths in include command */
 /* this is relative to position of simplex.c in harbour source tree */
 #define SLX_RULES "../macro/macro.slx"