[beast/devel: 64/77] BST: transition to RAPICORN_* macros

[Tim Janik <timj src gnome org>]

commit ae9bff4787b40813238d2e2d7b7c5f5cd3a71678
Author: Tim Janik <timj gnu org>
Date:   Sun Apr 14 19:33:41 2013 +0200

    BST: transition to RAPICORN_* macros

 beast-gtk/bstpatternctrl.cc |    8 ++++----
 beast-gtk/bstusermessage.hh |    2 +-
 r+d-files/bse-ellf.c        |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/beast-gtk/bstpatternctrl.cc b/beast-gtk/bstpatternctrl.cc
index a098ccf..7c04718 100644
--- a/beast-gtk/bstpatternctrl.cc
+++ b/beast-gtk/bstpatternctrl.cc
@@ -367,10 +367,10 @@ struct ConstKeyBindingItem {
 static BstKeyBindingItem*
 BstKeyBindingItem_from_ConstKeyBindingItem (const ConstKeyBindingItem *ckb)
 {
-  BIRNET_STATIC_ASSERT (sizeof (ConstKeyBindingItem) == sizeof (BstKeyBindingItem));
-  BIRNET_STATIC_ASSERT (offsetof (ConstKeyBindingItem, key_name) == offsetof (BstKeyBindingItem, key_name));
-  BIRNET_STATIC_ASSERT (offsetof (ConstKeyBindingItem, func_name) == offsetof (BstKeyBindingItem, 
func_name));
-  BIRNET_STATIC_ASSERT (offsetof (ConstKeyBindingItem, func_param) == offsetof (BstKeyBindingItem, 
func_param));
+  RAPICORN_STATIC_ASSERT (sizeof (ConstKeyBindingItem) == sizeof (BstKeyBindingItem));
+  RAPICORN_STATIC_ASSERT (offsetof (ConstKeyBindingItem, key_name) == offsetof (BstKeyBindingItem, 
key_name));
+  RAPICORN_STATIC_ASSERT (offsetof (ConstKeyBindingItem, func_name) == offsetof (BstKeyBindingItem, 
func_name));
+  RAPICORN_STATIC_ASSERT (offsetof (ConstKeyBindingItem, func_param) == offsetof (BstKeyBindingItem, 
func_param));
   return (BstKeyBindingItem*) ckb;
 }
 BstKeyBinding*
diff --git a/beast-gtk/bstusermessage.hh b/beast-gtk/bstusermessage.hh
index 24ff93c..a36becc 100644
--- a/beast-gtk/bstusermessage.hh
+++ b/beast-gtk/bstusermessage.hh
@@ -75,7 +75,7 @@ BstMsgBit*        bst_msg_bit_create_choice     (guint                   id,
 #define BST_MSG_DIALOG(lvl, ...)                ({ BstMsgType __mt = lvl; uint __result = 0;                 
 \
                                                    BstMsgBit *__ba[] = { __VA_ARGS__ };                      
 \
                                                    __result = bst_message_dialog_display (BIRNET_LOG_DOMAIN, 
 \
-                                                               __mt, BIRNET_ARRAY_SIZE (__ba), __ba);        
 \
+                                                               __mt, RAPICORN_ARRAY_SIZE (__ba), __ba);      
   \
                                                    __result; })
 G_END_DECLS
 #endif /* __BST_USER_MESSAGE_H__ */
diff --git a/r+d-files/bse-ellf.c b/r+d-files/bse-ellf.c
index 793a475..3679a3b 100644
--- a/r+d-files/bse-ellf.c
+++ b/r+d-files/bse-ellf.c
@@ -1576,9 +1576,9 @@ print_z_fraction_before_zplnc (void) /* must be called *before* zplnc() */
   code_printf ("    };\n");
   code_printf ("    filters[index].filter_request = &filter_request;\n");
   code_printf ("    filters[index].gain = %+.17e;\n", zgain);
-  code_printf ("    filters[index].n_zeros = BIRNET_ARRAY_SIZE (zeros) / 2;\n");
+  code_printf ("    filters[index].n_zeros = RAPICORN_ARRAY_SIZE (zeros) / 2;\n");
   code_printf ("    filters[index].zeros = zeros;\n");
-  code_printf ("    filters[index].n_poles = BIRNET_ARRAY_SIZE (poles) / 2;\n");
+  code_printf ("    filters[index].n_poles = RAPICORN_ARRAY_SIZE (poles) / 2;\n");
   code_printf ("    filters[index].poles = poles;\n");
   code_printf ("    index++;\n");
   code_printf ("  }\n");