1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | Index: msgqueue.h
===================================================================
--- msgqueue.h (revision 4699)
+++ msgqueue.h (working copy)
@@ -36,12 +36,20 @@
char *seq; /* numer sekwencyjny */
time_t time; /* czas wys�ania */
unsigned int mark : 1; /* if added during cleanup */
+#if defined(__cplusplus)
+ msgclass_t __class__;
+#else
msgclass_t class;
+#endif
} msg_queue_t;
extern msg_queue_t *msgs_queue;
-int msg_queue_add(const char *session, const char *rcpts, const char *message, const char *seq, msgclass_t class);
+#if defined(__cplusplus)
+ int msg_queue_add(const char *session, const char *rcpts, const char *message, const char *seq, msgclass_t __class__);
+#else
+ int msg_queue_add(const char *session, const char *rcpts, const char *message, const char *seq, msgclass_t class);
+#endif
void msgs_queue_destroy();
int msg_queue_count_session(const char *uid);
int msg_queue_remove_uid(const char *uid);
Index: themes.h
===================================================================
--- themes.h (revision 4699)
+++ themes.h (working copy)
@@ -45,7 +45,11 @@
przej�ciu do kolejnej linii. */
unsigned int prompt_empty : 1; /* prompt przy przenoszeniu b�dzie pusty */
int margin_left; /* where the margin is set (on what char) */
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private; /* can be helpfull */
+#endif
} fstring_t;
#define print(x...) print_window_w(NULL, EKG_WINACT_JUNK, x)
Index: scripts.h
===================================================================
--- scripts.h (revision 4699)
+++ scripts.h (working copy)
@@ -28,7 +28,11 @@
void *lang;
char *name;
char *path;
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
int inited;
} script_t;
extern script_t *scripts;
@@ -37,13 +41,21 @@
script_t *scr;
struct timer *self;
int removed;
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
} script_timer_t;
typedef struct {
script_t *scr;
plugin_t *self;
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
} script_plugin_t;
typedef struct {
@@ -52,7 +64,11 @@
char *name;
char *value;
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
} script_var_t;
typedef struct {
@@ -60,14 +76,22 @@
query_t *self;
int argc;
int argv_type[MAX_ARGS];
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
int hack;
} script_query_t;
typedef struct {
script_t *scr;
command_t *self;
- void *private;
+#if defined(__cplusplus)
+ void *__private__;
+#else
+ void *private;
+#endif
} script_command_t;
typedef struct {
@@ -75,7 +99,11 @@
watch_t *self;
int removed;
void *data;
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
} script_watch_t;
typedef int (scriptlang_initialize_t)();
@@ -109,8 +137,11 @@
script_handler_timer_t *script_handler_timer;
script_handler_var_t *script_handler_var;
script_handler_watch_t *script_handler_watch;
-
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
} scriptlang_t;
extern scriptlang_t *scriptlang;
@@ -159,10 +190,14 @@
script_handler_var : x##_variable_changed,\
script_handler_watch : x##_watches,\
}
+#if defined(__cplusplus)
+ #define script_private_get(s) (s->__private__)
+ #define script_private_set(s, p) (s->__private__ = p)
+#else
+ #define script_private_get(s) (s->private)
+ #define script_private_set(s, p) (s->private = p)
+#endif
-#define script_private_get(s) (s->private)
-#define script_private_set(s, p) (s->private = p)
-
#ifndef EKG2_WIN32_NOFUNCTION
int script_unload_lang(scriptlang_t *s);
Index: windows.h
===================================================================
--- windows.h (revision 4699)
+++ windows.h (working copy)
@@ -77,7 +77,11 @@
struct userlist *userlist; /* sometimes window may require separate userlist */
window_lastlog_t *lastlog; /* prywatne informacje lastloga */
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private; /* prywatne informacje ui */
+#endif
} window_t;
typedef enum {
Index: protocol.h
===================================================================
--- protocol.h (revision 4699)
+++ protocol.h (working copy)
@@ -83,13 +83,22 @@
#ifndef EKG2_WIN32_NOFUNCTION
void protocol_init();
+#if defined(__cplusplus)
char *message_print(const char *session, const char *sender, const char **rcpts, const char *text, const uint32_t *format,
+ time_t sent, int __class__, const char *seq, int dobeep, int secure);
+#else
+char *message_print(const char *session, const char *sender, const char **rcpts, const char *text, const uint32_t *format,
time_t sent, int class, const char *seq, int dobeep, int secure);
+#endif
int protocol_connected_emit(const session_t *s);
int protocol_disconnected_emit(const session_t *s, const char *reason, int type);
int protocol_message_ack_emit(const session_t *s, const char *rcpt, const char *seq, int status);
+#if defined(__cplusplus)
+int protocol_message_emit(const session_t *s, const char *uid, char **rcpts, const char *text, const uint32_t *format, time_t sent, int __class__, const char *seq, int dobeep, int secure);
+#else
int protocol_message_emit(const session_t *s, const char *uid, char **rcpts, const char *text, const uint32_t *format, time_t sent, int class, const char *seq, int dobeep, int secure);
+#endif
int protocol_status_emit(const session_t *s, const char *uid, int status, char *descr, time_t when);
int protocol_xstate_emit(const session_t *s, const char *uid, int state, int offstate);
Index: userlist.h
===================================================================
--- userlist.h (revision 4699)
+++ userlist.h (working copy)
@@ -72,7 +72,11 @@
status_t last_status; /**< Lastseen status */
char *last_descr; /**< Lastseen description */
time_t status_time; /**< From when we have this status, description */
- void *private; /**< Alternate private data, used by ncurses plugin */
+#if defined(__cplusplus)
+ void *__private__;
+#else
+ void *private; /**<Alternate private data, used by ncurses plugin */
+#endif
private_data_t *priv_list; /* New user private data */
} userlist_t;
@@ -113,7 +117,11 @@
status_t status; /**< status, like u->status [status of resource] */
char *descr; /**< descr, like u->descr [description of resource] */
int prio; /**< prio of resource [priority of this resource] */
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private; /**< priv, like u->private [private data info/struct] */
+#endif
} ekg_resource_t;
/**
Index: stuff.h
===================================================================
--- stuff.h (revision 4699)
+++ stuff.h (working copy)
@@ -61,11 +61,19 @@
plugin_t *plugin; /* obs�uguj�cy plugin */
char *name; /* nazwa, wy�wietlana przy /exec */
child_handler_t handler; /* zak�ad pogrzebowy */
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private; /* dane procesu */
+#endif
} child_t;
#ifndef EKG2_WIN32_NOFUNCTION
-child_t *child_add(plugin_t *plugin, pid_t pid, const char *name, child_handler_t handler, void *private);
+#if defined(__cplusplus)
+ child_t *child_add(plugin_t *plugin, pid_t pid, const char *name, child_handler_t handler, void *__private__);
+#else
+ child_t *child_add(plugin_t *plugin, pid_t pid, const char *name, child_handler_t handler, void *private);
+#endif
child_t *children_removei(child_t *c);
void children_destroy(void);
#endif
@@ -120,7 +128,11 @@
char *session;
char *name;
struct userlist *participants;
+#if defined(__cplusplus)
+ void *__private__;
+#else
void *private;
+#endif
} newconference_t;
struct buffer {
@@ -319,7 +331,10 @@
char *xstrmid(const char *str, int start, int length);
void xstrtr(char *text, char from, char to);
char color_map(unsigned char r, unsigned char g, unsigned char b);
-char *strcasestr(const char *haystack, const char *needle);
+#if defined(__cplusplus)
+#else
+ char *strcasestr(const char *haystack, const char *needle);
+#endif
int msg_all(session_t *s, const char *function, const char *what);
int say_it(const char *str);
char *split_line(char **ptr);
|