Browse Source

Updates for release.

upstream/xfce4-panel-4.10.1
Nick Schermer 12 years ago
parent
commit
9675293142
  1. 6
      common/panel-private.h
  2. 2
      configure.ac.in

6
common/panel-private.h

@ -20,7 +20,7 @@
#define __PANEL_PRIVATE_H__
/* support macros for debugging (improved macro for better position indication) */
#ifndef NDEBUG
/*#ifndef NDEBUG*/
#define panel_assert(expr) g_assert (expr)
#define panel_assert_not_reached() g_assert_not_reached ()
#define panel_return_if_fail(expr) G_STMT_START { \
@ -39,12 +39,12 @@
#expr); \
return (val); \
}; }G_STMT_END
#else
/*#else
#define panel_assert(expr) G_STMT_START{ (void)0; }G_STMT_END
#define panel_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
#define panel_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
#define panel_return_val_if_fail(expr,val) G_STMT_START{ (void)0; }G_STMT_END
#endif
#endif*/
/* handling flags */
#define PANEL_SET_FLAG(flags,flag) G_STMT_START{ ((flags) |= (flag)); }G_STMT_END

2
configure.ac.in

@ -15,7 +15,7 @@ m4_define([xfce4_panel_version_minor], [7])
m4_define([xfce4_panel_version_micro], [0])
m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version
m4_define([xfce4_panel_version_build], [@REVISION@])
m4_define([xfce4_panel_version_tag], [git])
m4_define([xfce4_panel_version_tag], [])
m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])])
dnl *******************************************

Loading…
Cancel
Save