fixed compilation problem with old gcc releases

[wxWidgets.git] / src / iodbc / itrace.h

diff --git a/src/iodbc/itrace.h b/src/iodbc/itrace.h
index 6b4e850cbaea00b84da02ed611104557c50e6416..61ba072ec897e7648d7a152818c72b66f62852e5 100644 (file)
--- a/src/iodbc/itrace.h
+++ b/src/iodbc/itrace.h
@@ -1,24 +1,51 @@
+/*
+ *  itrace.h
+ *
+ *  $Id$
+ *
+ *  Trace functions
+ *
+ *  The iODBC driver manager.
+ *  
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 #ifndef        _ITRACE_H
-# define _ITRACE_H
+#define _ITRACE_H
 
-# ifdef        DEBUG
-#  ifndef NO_TRACE
-#   define NO_TRACE
-#  endif
-# endif
+#ifdef DEBUG
 
-# define TRACE_TYPE_APP2DM     1
-# define TRACE_TYPE_DM2DRV     2
-# define TRACE_TYPE_DRV2DM     3
+#ifndef NO_TRACE
+#define NO_TRACE
+#endif
+
+#endif
 
-# define TRACE_TYPE_RETURN     4
+#define TRACE_TYPE_APP2DM      1
+#define TRACE_TYPE_DM2DRV      2
+#define TRACE_TYPE_DRV2DM      3
 
-extern HPROC   _iodbcdm_gettrproc(void FAR* stm, int procid, int type);
+#define TRACE_TYPE_RETURN      4
 
-# ifdef NO_TRACE
-#  define TRACE_CALL( stm, trace_on, procid, plist )   
-# else
-#  define TRACE_CALL( stm, trace_on, plist )\
+extern HPROC _iodbcdm_gettrproc (void FAR * stm, int procid, int type);
+
+#ifdef NO_TRACE
+#define TRACE_CALL( stm, trace_on, procid, plist )
+#else
+#define TRACE_CALL( stm, trace_on, plist )\
        {\
                if( trace_on)\
                {\
@@ -30,12 +57,12 @@ extern HPROC        _iodbcdm_gettrproc(void FAR* stm, int procid, int type);
                                hproc plist;\
                }\
        }
-# endif
+#endif
 
-# ifdef NO_TRACE
-#  define TRACE_DM2DRV( stm, procid, plist )
-# else
-#  define TRACE_DM2DRV( stm, procid, plist )\
+#ifdef NO_TRACE
+#define TRACE_DM2DRV( stm, procid, plist )
+#else
+#define TRACE_DM2DRV( stm, procid, plist )\
        {\
                HPROC   hproc;\
 \
@@ -44,12 +71,12 @@ extern HPROC        _iodbcdm_gettrproc(void FAR* stm, int procid, int type);
                if( hproc )\
                        hproc plist;\
        }
-# endif
+#endif
 
-# ifdef NO_TRACE
-#  define TRACE_DRV2DM( stm, procid, plist )
-# else
-#  define TRACE_DRV2DM( stm, procid, plist ) \
+#ifdef NO_TRACE
+#define TRACE_DRV2DM( stm, procid, plist )
+#else
+#define TRACE_DRV2DM( stm, procid, plist ) \
        {\
                HPROC   hproc;\
 \
@@ -58,12 +85,12 @@ extern HPROC        _iodbcdm_gettrproc(void FAR* stm, int procid, int type);
                if( hproc )\
                                hproc plist;\
        }
-# endif
+#endif
 
-# ifdef NO_TRACE
-#  define TRACE_RETURN( stm, trace_on, ret )
-# else
-#  define TRACE_RETURN( stm, trace_on, ret )\
+#ifdef NO_TRACE
+#define TRACE_RETURN( stm, trace_on, ret )
+#else
+#define TRACE_RETURN( stm, trace_on, ret )\
        {\
                if( trace_on ) {\
                        HPROC hproc;\
@@ -74,12 +101,12 @@ extern HPROC       _iodbcdm_gettrproc(void FAR* stm, int procid, int type);
                                hproc( stm, ret );\
                }\
        }
-# endif
+#endif
 
-# ifdef        NO_TRACE 
-#  define CALL_DRIVER( hdbc, ret, proc, procid, plist )        { ret = proc plist; }
-# else
-#  define CALL_DRIVER( hdbc, ret, proc, procid, plist )\
+#ifdef NO_TRACE
+#define CALL_DRIVER( hdbc, ret, proc, procid, plist )  { ret = proc plist; }
+#else
+#define CALL_DRIVER( hdbc, ret, proc, procid, plist )\
        {\
                DBC_t FAR*      pdbc = (DBC_t FAR*)(hdbc);\
 \
@@ -92,6 +119,6 @@ extern HPROC _iodbcdm_gettrproc(void FAR* stm, int procid, int type);
                else\
                        ret = proc plist;\
        }
-# endif
+#endif
 
 #endif