[Mod-c-cvs] ehtml/include ChangeLog, 1.4, 1.5 Profiling.h, 1.6, 1.7 Session.h, 1.12, 1.13 ehtml.h, 1.19, 1.20

[Matej U. <mat...@us...>]

Update of /cvsroot/mod-c/ehtml/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16193/include

Modified Files:
	ChangeLog Profiling.h Session.h ehtml.h 
Log Message:
Made profiling optional.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mod-c/ehtml/include/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog	12 Sep 2006 23:11:58 -0000	1.4
--- ChangeLog	17 Sep 2006 18:14:51 -0000	1.5
***************
*** 1,2 ****
--- 1,9 ----
+ 2006-09-17  Matej Urbas <mat...@gm...>
+ 
+ 	* ehtml.h: Moved the definition of EXTERNC into ehtml.h
+ 	* Profiling.h: Made ProfileMe et al optional (depending upon the
+ 	  WITH_PROFILING macro).
+ 	* Session.h: Removed EXTERNC (is now in ehtml.h).
+ 
  2006-09-13  Matej Urbas <mat...@gm...>
  

Index: ehtml.h
===================================================================
RCS file: /cvsroot/mod-c/ehtml/include/ehtml.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ehtml.h	8 Sep 2006 14:26:32 -0000	1.19
--- ehtml.h	17 Sep 2006 18:14:51 -0000	1.20
***************
*** 38,41 ****
--- 38,47 ----
  #define EHTML_INVALID_CALL      -3 /** Invalid call */
  
+ #ifdef __cplusplus
+ #define EXTERNC extern "C"
+ #else  /* #ifdef __cplusplus */
+ #define EXTERNC
+ #endif
+ 
  /**
   *  The name of the entry function of ehtml files.

Index: Profiling.h
===================================================================
RCS file: /cvsroot/mod-c/ehtml/include/Profiling.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Profiling.h	13 Sep 2006 14:59:50 -0000	1.6
--- Profiling.h	17 Sep 2006 18:14:51 -0000	1.7
***************
*** 7,10 ****
--- 7,18 ----
  #define MAX_DEPTH 512
  
+ #ifndef EXTERNC
+ #ifdef __cplusplus
+ #define EXTERNC extern "C"
+ #else  /* #ifdef __cplusplus */
+ #define EXTERNC
+ #endif
+ #endif
+ 
  typedef int64_t hrtime_t;
  
***************
*** 67,70 ****
--- 75,79 ----
  };
  
+ #ifdef WITH_PROFILING
  /**
   * This makes easy to profile a function, simply add the line 
***************
*** 80,87 ****
  	static ProfileFunction __profile((name), __FILE__, __LINE__);\
  	ProfileRun __profile_run(&__profile);
  
! #define EXTERNC extern "C"
! #else  /* #ifdef __cplusplus */
! #define EXTERNC
  #endif /* #ifdef __cplusplus */
  
--- 89,100 ----
  	static ProfileFunction __profile((name), __FILE__, __LINE__);\
  	ProfileRun __profile_run(&__profile);
+ #else
+ #define ProfileMe()
+ #define ProfileMeName(name)
+ #endif
  
! // #define EXTERNC extern "C"
! // #else  /* #ifdef __cplusplus */
! // #define EXTERNC
  #endif /* #ifdef __cplusplus */
  

Index: Session.h
===================================================================
RCS file: /cvsroot/mod-c/ehtml/include/Session.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Session.h	12 Sep 2006 15:23:32 -0000	1.12
--- Session.h	17 Sep 2006 18:14:51 -0000	1.13
***************
*** 162,168 ****
  	virtual bool Release(Session*) = 0;
  };
! #define EXTERNC extern "C"
! #else /* ifdef __cplusplus */
! #define EXTERNC extern
  #endif
  
--- 162,168 ----
  	virtual bool Release(Session*) = 0;
  };
! // #define EXTERNC extern "C"
! // #else /* ifdef __cplusplus */
! // #define EXTERNC extern
  #endif