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