From: <enl...@li...> - 2004-05-06 23:51:23
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/etox Dir : e17/libs/etox/src Modified Files: Etox.h Log Message: - make the etox header c++ friendly =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/etox/src/Etox.h,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- Etox.h 6 May 2004 05:23:15 -0000 1.49 +++ Etox.h 6 May 2004 23:51:16 -0000 1.50 @@ -7,7 +7,6 @@ /* * Simple alignment bitfield */ -typedef enum _etox_alignment Etox_Alignment; enum _etox_alignment { ETOX_ALIGN_CENTER = 0, @@ -16,23 +15,24 @@ ETOX_ALIGN_TOP = 4, ETOX_ALIGN_BOTTOM = 8 }; +typedef enum _etox_alignment Etox_Alignment; #define ETOX_ALIGN_MASK 0xF -typedef enum _etox_bit_type Etox_Bit_Type; enum _etox_bit_type { ETOX_BIT_TYPE_TEXT = 0, ETOX_BIT_TYPE_OBSTACLE = 1, ETOX_BIT_TYPE_WRAP_MARKER = 2 }; +typedef enum _etox_bit_type Etox_Bit_Type; -typedef enum _etox_marker_placement Etox_Marker_Placement; enum _etox_marker_placement { ETOX_MARKER_BEGINNING = 0, ETOX_MARKER_END = 1, }; +typedef enum _etox_marker_placement Etox_Marker_Placement; /* * The context structure holds information relative to the appearance of text @@ -96,6 +96,10 @@ typedef struct _etox_obstacle Etox_Obstacle; typedef struct _etox_selection Etox_Selection; +#ifdef __cplusplus +extern "C" { +#endif + /* * Etox creation and deletion functions */ @@ -241,4 +245,8 @@ Etox_Context *context); Etox_Rect *etox_selection_get_geometry(Etox_Selection *selected, int *num); +#ifdef __cplusplus +} +#endif + #endif |