forked from osmocom/wireshark
mate_grammar.lemon:
- Fix a bug my previous patch introduced. mate/: - Unset G_DISABLE_DEPRECATED for the mate files. CMakeLists.txt configure.in: - Build with -DG_DISABLE_DEPRECATED so further usage of deprecated glib functions will be detected. svn path=/trunk/; revision=38393
This commit is contained in:
parent
c15ff441c6
commit
553c565699
|
@ -27,9 +27,11 @@ cmake_minimum_required(VERSION 2.6)
|
|||
set(CMAKE_BACKWARDS_COMPATIBILITY 2.6)
|
||||
|
||||
# Needs to be set after cmake_minimum_required or cmake_policy(VERSION)
|
||||
#if(COMMAND cmake_policy)
|
||||
if(COMMAND cmake_policy)
|
||||
# Backward compatibility for versions < 2.6.3
|
||||
cmake_policy(SET CMP0011 OLD)
|
||||
# cmake_policy(SET CMP0015 NEW)
|
||||
#endif(COMMAND cmake_policy)
|
||||
endif(COMMAND cmake_policy)
|
||||
|
||||
# set(PROJECT_VERSION "1.3.4-rc5")
|
||||
# set(PROJECT_VERSION "1.3.4rc5")
|
||||
|
@ -158,6 +160,7 @@ endif()
|
|||
|
||||
add_definitions(
|
||||
-DHAVE_CONFIG_H
|
||||
-DG_DISABLE_DEPRECATED
|
||||
)
|
||||
|
||||
# Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
|
||||
|
|
|
@ -885,6 +885,8 @@ AC_MSG_CHECKING(whether GLib supports loadable modules)
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
# Error out on the usage of deprecated glib functions
|
||||
CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
|
||||
LIBS="$GLIB_LIBS $LIBS"
|
||||
AC_TRY_RUN([
|
||||
#include <glib.h>
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#undef G_DISABLE_DEPRECATED
|
||||
|
||||
#ifndef ENABLE_STATIC
|
||||
#include "moduleinfo.h"
|
||||
#include <gmodule.h>
|
||||
|
|
|
@ -132,7 +132,7 @@ static gchar* recolonize(mate_config* mc, gchar* s) {
|
|||
vec = g_strsplit(s,":",0);
|
||||
|
||||
for (i = 0; vec[i]; i++) {
|
||||
g_ascii_strdown(vec[i]);
|
||||
g_ascii_strdown(vec[i], -1);
|
||||
|
||||
v = 0;
|
||||
switch ( strlen(vec[i]) ) {
|
||||
|
|
|
@ -42,12 +42,12 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <wsutil/file_util.h>
|
||||
|
||||
#include "mate.h"
|
||||
#include "mate_grammar.h"
|
||||
#include "mate_parser_lex.h"
|
||||
|
||||
#include <wsutil/file_util.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
/* disable Windows VC compiler warning "signed/unsigned mismatch" associated */
|
||||
/* with YY_INPUT code generated by flex versions such as 2.5.35. */
|
||||
|
|
Loading…
Reference in New Issue