X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=442a8a05d9e3661ddde7835d424c89c4c4259f7c;hb=7c041af6425001d7779f5e44d72918d8591ea37d;hp=6688cbfb9485196e1f5468082a034fc669b1303f;hpb=c2653e451cd4ffb162a25267f86ad40d0c956f61;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 6688cbfb94..442a8a05d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT([LyX],[2.4.0~RC1.devel],[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT([LyX],[2.5.0~devel],[lyx-devel@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2023-06-26"])
+AC_SUBST(LYX_DATE, ["2024-04-01"])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -313,32 +313,6 @@ char * strerror(int n);
 #  define USE_WCHAR_T
 #endif
 
-#if defined(__GNUC__) && !defined(__clang__)
-/* This macro can be used to stipulate that a given GCC warning is not
- * relevant in a given block.
- *
- * The -Wpragmas bit takes care of the case where -W<warn> is not implemented
- *
- * The idea for PRAGMA_IGNORE has been stolen from
- * https://stackoverflow.com/questions/45762357/how-to-concatenate-strings-in-the-arguments-of-pragma#comment124444258_45783809
- * The difficulty is to put the <warn> value inside nested quotes; it is done
- * using nested macros.
- */
-#  define PRAGMA_IGNORE(x) PRAGMA_IGNORE_1(-W##x)
-#  define PRAGMA_IGNORE_1(x) PRAGMA_IGNORE_2(#x)
-#  define PRAGMA_IGNORE_2(x) PRAGMA_IGNORE_3(GCC diagnostic ignored x)
-#  define PRAGMA_IGNORE_3(x) _Pragma(#x)
-#  define LYX_BEGIN_MUTE_GCC_WARNING(warn)		\
-  _Pragma("GCC diagnostic push") \
-  _Pragma("GCC diagnostic ignored \"-Wpragmas\"") \
-  PRAGMA_IGNORE(warn)
-#  define LYX_END_MUTE_GCC_WARNING \
-  _Pragma("GCC diagnostic pop")
-#else
-#  define LYX_BEGIN_MUTE_GCC_WARNING(warn)
-#  define LYX_END_MUTE_GCC_WARNING
-#endif
-
 
 #endif
 ])