From: bernie Date: Mon, 16 Jan 2006 03:30:57 +0000 (+0000) Subject: Make header C++ friendly. X-Git-Tag: 1.0.0~775 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=85c1ab406a633641eeadc7d093d68c6f3ef10642;p=bertos.git Make header C++ friendly. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@466 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/drv/timer_posix.c b/drv/timer_posix.c index 9814dc24..c97593c8 100755 --- a/drv/timer_posix.c +++ b/drv/timer_posix.c @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2006/01/16 03:30:21 bernie + *#* Make header C++ friendly. + *#* *#* Revision 1.1 2005/11/27 03:58:18 bernie *#* Add POSIX timer emulator. *#* @@ -34,7 +37,7 @@ void timer_isr(int); /// HW dependent timer initialization. -extern "C" static void timer_hw_init(void) +EXTERN_C static void timer_hw_init(void) { struct sigaction sa; memset(&sa, 0, sizeof(sa)); @@ -55,7 +58,7 @@ extern "C" static void timer_hw_init(void) setitimer(ITIMER_REAL, &itv, NULL); } -extern "C" INLINE hptime_t timer_hw_hpread(void) +INLINE hptime_t timer_hw_hpread(void) { return hptime_get(); } diff --git a/gfx/gfx.h b/gfx/gfx.h index 0c5f2d67..bd4124fa 100755 --- a/gfx/gfx.h +++ b/gfx/gfx.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.4 2006/01/16 03:30:57 bernie + *#* Make header C++ friendly. + *#* *#* Revision 1.3 2005/11/27 23:33:40 bernie *#* Use appconfig.h instead of cfg/config.h. *#* @@ -43,6 +46,7 @@ #include #include +EXTERN_C_BEGIN /*! Common type for coordinates expressed in pixel units */ typedef int coord_t; @@ -105,4 +109,6 @@ extern coord_t gfx_transformY(Bitmap *bm, vcoord_t y); extern void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2); #endif /* CONFIG_GFX_VCOORDS */ +EXTERN_C_END + #endif /* GFX_GFX_H */