diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 30fffa42b9..8dcd60484c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-03 13:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/estack.c
+    * pacified OS2 warning
+
 2008-10-03 09:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * source/vm/extrap.c
     + Now using standard internal error call for Windows too.
diff --git a/harbour/source/vm/estack.c b/harbour/source/vm/estack.c
index b489b67f5d..a8aa77a6af 100644
--- a/harbour/source/vm/estack.c
+++ b/harbour/source/vm/estack.c
@@ -118,10 +118,10 @@
                                       hb_tls_set( hb_stack_key, \
                                                   hb_xgrab( sizeof( HB_STACK ) ) ); \
                                  } while ( 0 )
-#     define hb_stack_dealloc()  do { hb_xfree( hb_tls_get( hb_stack_key ) ); \
+#     define hb_stack_dealloc()  do { hb_xfree( ( void * ) hb_tls_get( hb_stack_key ) ); \
                                       hb_tls_set( hb_stack_key, NULL ); } \
                                  while ( 0 )
-#     define hb_stack_ready()    ( s_fInited && hb_tls_get( hb_stack_key ) != NULL )
+#     define hb_stack_ready()    ( s_fInited && hb_tls_get( hb_stack_key ) )
 
 #endif /* HB_USE_TLS */