Changeset 3708 in MondoRescue


Ignore:
Timestamp:
Apr 13, 2018, 12:29:46 PM (6 years ago)
Author:
Bruno Cornec
Message:

daptation for gcc 5 (inline funcs mngt)

Location:
branches/3.3/mondo/src/include
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3/mondo/src/include/mr_err.h

    r2208 r3708  
    1010
    1111#include "mr_msg.h"
     12#include "mr_std.h"
    1213
    1314/* functions (public methods) */
    1415
    15 extern inline void mr_exit(int errorcode, const char *message);
     16MR_EXTERN void mr_exit(int errorcode, const char *message);
    1617#define mr_log_exit(x,y) {mr_msg(0,y); mr_exit(x, y);}
    1718

  • branches/3.3/mondo/src/include/mr_mem.h

    r3185 r3708  
    1414#include <stdarg.h>
    1515#include <stdio.h>
     16#include "mr_std.h"
    1617
    1718/* functions (public methods) */
    … …  
    2728/* Internal function bringing debuging info
    2829 * called indirectly through macros */
    29 extern inline void mr_free_int(void **allocated, int line, char *file);
    30 extern inline void mr_allocstr_int(char *alloc, const char *orig, int line, char *file);
    31 extern inline void mr_asprintf_int(char **alloc, int line, char *file, const char *fmt, ...);
    32 extern inline void mr_getline_int(char **lineptr, FILE *stream, int line, char *file);
    33 extern inline void *mr_malloc_int(size_t size, int line, char *file);
    34 extern inline void mr_setenv_int(const char *name, const char *value, int line, char *file);
     30MR_EXTERN void mr_free_int(void **allocated, int line, char *file);
     31MR_EXTERN void mr_allocstr_int(char *alloc, const char *orig, int line, char *file);
     32MR_EXTERN void mr_asprintf_int(char **alloc, int line, char *file, const char *fmt, ...);
     33MR_EXTERN void mr_getline_int(char **lineptr, FILE *stream, int line, char *file);
     34MR_EXTERN void *mr_malloc_int(size_t size, int line, char *file);
     35MR_EXTERN void mr_setenv_int(const char *name, const char *value, int line, char *file);
    3536extern void mr_strcat_int(char **in, int line, char *file, const char *fmt, ...);
    3637

  • branches/3.3/mondo/src/include/mr_msg.h

    r3628 r3708  
    1313#endif
    1414#include <stdarg.h>
     15#include "mr_std.h"
    1516
    1617/* functions (public methods) */
    … …  
    2324/* Internal function bringing debuging info
    2425 * called indirectly through macros */
    25 extern inline void mr_msg_int(int debug, int line, const char *file, const char *function, const char *fmt, ...);
     26MR_EXTERN void mr_msg_int(int debug, int line, const char *file, const char *function, const char *fmt, ...);
    2627
    2728#endif                          /* MR_MSG_H */

  • branches/3.3/mondo/src/include/mr_str.h

    r3614 r3708  
    1717extern char *mr_strtok(char *instr, const char *delims, int *lastpos);
    1818extern char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr);
    19 extern inline char *mr_date(void);
     19extern char *mr_date(void);
    2020extern char *mr_strip_spaces(const char *instr);
    2121extern char *mr_str_substitute(const char *in, const char *token, const char *subst);

  • branches/3.3/mondo/src/include/mr_sys.h

    r3509 r3708  
    1515#include <stdio.h>
    1616#include "mr_msg.h"
     17#include "mr_std.h"
    1718
    1819/* Internal function bringing debuging info
    1920 * called indirectly through macros */
    20 extern inline int mr_system_int(int line, char *file, const char *fmt, ...);
     21MR_EXTERN int mr_system_int(int line, char *file, const char *fmt, ...);
    2122
    2223/* functions (public methods) */
Note: See TracChangeset for help on using the changeset viewer.