Merge remote-tracking branch 'github/master'

This commit is contained in:
Dave Davenport 2017-03-28 17:06:40 +02:00
commit 9210ce9aad
5 changed files with 14 additions and 1 deletions

View File

@ -37,7 +37,7 @@ typedef struct _ParseObject {
char *filename;
/** Length of string */
ssize_t str_len;
yy_size_t str_len;
/** String */
const char *input_str;
/** Position in file */

View File

@ -23,6 +23,9 @@ unsigned int test =0;
} \
}
void config_parser_set_option ( const char *k, const char *v)
{
}
char * rofi_expand_path ( const char *path )
{

View File

@ -22,6 +22,9 @@ unsigned int test =0;
abort ( ); \
} \
}
void config_parser_set_option ( const char *k, const char *v)
{
}
void rofi_add_error_message ( GString *msg )
{}

View File

@ -22,6 +22,10 @@ unsigned int normal_window_mode = 0;
#include "view.h"
void config_parser_set_option ( const char *k, const char *v)
{
}
void rofi_add_error_message ( GString *msg)
{
}

View File

@ -12,6 +12,9 @@ unsigned int test =0;
assert ( a ); \
printf ( "Test %3i passed (%s)\n", ++test, # a ); \
}
void config_parser_set_option ( const char *k, const char *v)
{
}
void rofi_add_error_message ( GString *msg )
{
}