X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=swcsa%2Futils%2Fbasics.c;fp=swcsa%2Futils%2Fbasics.c;h=398e9758d35131ed4ea0716608e0b71e69cde366;hb=a56dda3a95d2df268969bd3c2c994b5d2f020410;hp=c9cb275f729e7bf89f80adc6b14d373113c74d4d;hpb=338b9d601d0bae8ee76813852ea146ef7ba901d8;p=SXSI%2FTextCollection.git

diff --git a/swcsa/utils/basics.c b/swcsa/utils/basics.c
index c9cb275..398e975 100755
--- a/swcsa/utils/basics.c
+++ b/swcsa/utils/basics.c
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 // Basics
 
@@ -10,9 +7,9 @@ extern "C" {
 #include <stdlib.h>
 
 		// Memory management
-
-static	void *Malloc (size_t n)
-
+	
+	void *Malloc (int n)
+	
 	   { void *p;
 	     if (n == 0) return NULL;
 	     p = (void*) malloc (n);
@@ -22,14 +19,14 @@ static	void *Malloc (size_t n)
 	        }
 	     return p;
 	   }
-
-static	void Free (void *p)
-
-	   { if (p) free (p);
+	
+	void Free (void *p)
+	
+	   { if (p) free (p); 
 	   }
-
-static	void *Realloc (void *p, size_t n)
-
+	
+	void *Realloc (void *p, int n)
+	
 	   { if (p == NULL) return Malloc (n);
 	     if (n == 0) { Free(p); return NULL; }
 	     p = (void*) realloc (p,n);
@@ -44,7 +41,7 @@ static	void *Realloc (void *p, size_t n)
 
         // bits needed to represent a number between 0 and n
 
-uint _bits (uint n)
+uint bits (uint n)
 
    { uint b = 0;
      while (n)
@@ -71,7 +68,7 @@ uint bitread (uint *e, uint p, uint len)
 
   	// writes e[p..p+len-1] = s, len <= W
 
-void bitwrite (register uint *e, register uint p,
+void bitwrite (register uint *e, register uint p, 
 	       register uint len, register uint s)
 
    { e += p/W; p %= W;
@@ -92,7 +89,7 @@ void bitwrite (register uint *e, register uint p,
    }
   	// writes e[p..p+len-1] = 0
 
-void bitzero2 (register uint *e, register uint p,
+void bitzero2 (register uint *e, register uint p, 
 	       register uint len)
 
    { e += p/W; p %= W;
@@ -108,6 +105,3 @@ void bitzero2 (register uint *e, register uint p,
      if (len > 0)
 	*e &= ~(((1<<len)-1)<<p);
    }
-#ifdef __cplusplus
-}
-#endif