diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 95c11f1a8a..59fd17f1e7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,10 @@
+20000801-21:55 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
+   * config/os2/global.cf
+     ! fixed removing of nested subdir (HB_ARCHITECTURE/HB_COMPILER) that under OS/2 you need to
+       remove from the bottom up and not a single DEL command
+   * source/compiler/cmdcheck.c
+     ! removed GCC warning since isdigit() expects an int but was called with a char
+
 2000-08-01 12:10 UTC+0800 Ron Pinkas <ron@profit-master.com>
    * source/compiler/cmdcheck.c
      + Added support for "new style" switches specs, for command line arguments.
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index 80ac8d3b1a..29567af0d5 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -1,54 +1,111 @@
 #
+
 # $Id$
+
 #
 
+
+
 all : first
 
+
+
 HB_GT_LIBS=\
+
         gtos2 \
+
         gtpca \
+
         gtstd \
 
+
+
 ifeq ($(HB_GT_LIB),)
+
    HB_GT_LIB = gtos2
+
 endif
 
+
+
 ifeq ($(SHLVL),) # An OS/2 command shell
 
+
+
 ARCH_DIR = $(ARCH)
-OS2_ARCH_DIR = $(subst /,\,$(ARCH)\)
+
+OS2_ARCH_DIR = $(subst /,\,$(ARCH))
+
 MK = $(subst /,\,$(subst \~,~,$(MAKE)))
 
+
+
 RM = del /n
+
 RD = rmdir
+
 CP = copy
+
 MV = move
+
 MD = md
 
+
+
 dirbase::
+
 	-CMD.EXE /c IF NOT EXIST $(HB_ARCHITECTURE) $(MD) $(HB_ARCHITECTURE)
+
 	-CMD.EXE /c IF NOT EXIST $(OS2_ARCH_DIR)    $(MD) $(OS2_ARCH_DIR)
 
+
+
 clean::
-	-CMD.EXE /c IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
+
+	-CMD.EXE /c IF EXIST $(OS2_ARCH_DIR)\\*.* $(RM) $(OS2_ARCH_DIR)\\*.*
+
 	-CMD.EXE /c IF EXIST $(OS2_ARCH_DIR)     $(RD) $(OS2_ARCH_DIR)
 
+	-CMD.EXE /c IF EXIST $(HB_ARCHITECTURE)  $(RD) $(HB_ARCHITECTURE)
+
+
+
 else  # bash
 
+
+
 ARCH_DIR = $(ARCH)/
+
 MK = $(MAKE)
 
+
+
 RM = rm -f
+
 RD = rm -f -r
+
 CP = cp -f
+
 MV = mv -f
+
 MD = mkdir
 
+
+
 dirbase::
+
 	@[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE); \
+
 	 [ -d $(ARCH) ] || $(MD) $(ARCH)
 
+
+
 clean::
+
 	-$(RD) $(ARCH_DIR)
 
+
+
 endif
+
+
\ No newline at end of file
diff --git a/harbour/source/compiler/cmdcheck.c b/harbour/source/compiler/cmdcheck.c
index 7081622a0c..538406ad64 100644
--- a/harbour/source/compiler/cmdcheck.c
+++ b/harbour/source/compiler/cmdcheck.c
@@ -235,7 +235,7 @@ void hb_compChkCompilerSwitch( int iArg, char * Args[] )
 
                      case 'e' :
                      case 'E' :
-                       if( Args[i][j + 1] && toupper( Args[i][j + 1] ) == 'S' && Args[i][j + 2] && isdigit( Args[i][j + 2] ) )
+                       if( Args[i][j + 1] && toupper( Args[i][j + 1] ) == 'S' && Args[i][j + 2] && isdigit((int) Args[i][j + 2] ) )
                        {
                           Switch[2] = 'S';
                           Switch[3] = Args[i][j + 2];
@@ -256,7 +256,7 @@ void hb_compChkCompilerSwitch( int iArg, char * Args[] )
 
                      case 'g' :
                      case 'G' :
-                       if( Args[i][j + 1] && toupper( Args[i][j + 1] ) == 'C' && Args[i][j + 2] && isdigit( Args[i][j + 2] ) )
+                       if( Args[i][j + 1] && toupper( Args[i][j + 1] ) == 'C' && Args[i][j + 2] && isdigit((int) Args[i][j + 2] ) )
                        {
                           Switch[2] = 'C';
                           Switch[3] = Args[i][j + 2];
@@ -305,7 +305,7 @@ void hb_compChkCompilerSwitch( int iArg, char * Args[] )
 
                      case 'q' :
                      case 'Q' :
-                       if( Args[i][j + 1] && isdigit( Args[i][j + 1] ) )
+                       if( Args[i][j + 1] && isdigit((int) Args[i][j + 1] ) )
                        {
                           Switch[2] = Args[i][j + 1];
                           Switch[3] = '\0';
@@ -334,7 +334,7 @@ void hb_compChkCompilerSwitch( int iArg, char * Args[] )
 
                      case 'w' :
                      case 'W' :
-                       if( Args[i][j + 1] && isdigit( Args[i][j + 1] ) )
+                       if( Args[i][j + 1] && isdigit((int) Args[i][j + 1] ) )
                        {
                           Switch[2] = Args[i][j + 1];
                           Switch[3] = '\0';