make pa_make_power_of_two() and pa_is_power_of_two() inline functions

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1698 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 0005e2207c05a504d6ba6fb6e206b0effb973c44..2c5a32e9e1ba032137e9dd120aa38f276c91448d 100644 (file)
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -1208,21 +1208,3 @@ char *pa_truncate_utf8(char *c, size_t l) {
     
     return c;
 }
-
-int pa_is_power_of_two(unsigned n) {
-    return !(n & (n - 1));
-}
-
-unsigned pa_make_power_of_two(unsigned n) {
-    unsigned j = n;
-
-    if (pa_is_power_of_two(n))
-        return n;
-    
-    while (j) {
-        j = j >> 1;
-        n = n | j;
-    }
-
-    return n + 1;
-}

diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index 29dc2fb1d76cc264e765e3714119a4537e4000c9..ea571e70331d888e943033d557d50fd549632703 100644 (file)
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -97,7 +97,22 @@ int pa_snprintf(char *str, size_t size, const char *format, ...);
 
 char *pa_truncate_utf8(char *c, size_t l);
 
-int pa_is_power_of_two(unsigned n);
-unsigned pa_make_power_of_two(unsigned n);
+static inline int pa_is_power_of_two(unsigned n) {
+    return !(n & (n - 1));
+}
+
+static inline unsigned pa_make_power_of_two(unsigned n) {
+    unsigned j = n;
+
+    if (pa_is_power_of_two(n))
+        return n;
+    
+    while (j) {
+        j = j >> 1;
+        n = n | j;
+    }
+
+    return n + 1;
+}
 
 #endif