X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=a0f6788a58661d30bdf7d020dc78064cc1d5f325;hb=be8d99292164b5708998ce8d46424574fc866f80;hp=888700b90f52de568d8f1ea719069ad57e8f2a91;hpb=3f301eee173427ceaa507c4ff3c189a7cf20da01;p=libucw.git

diff --git a/lib/lib.h b/lib/lib.h
index 888700b9..a0f6788a 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -1,7 +1,7 @@
 /*
  *	The UCW Library -- Miscellaneous Functions
  *
- *	(c) 1997--2005 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2006 Martin Mares <mj@ucw.cz>
  *	(c) 2005 Tomas Valla <tom@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
@@ -16,7 +16,9 @@
 
 /* Tell libc we're going to use all extensions available */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 /* Ugly structure handling macros */
 
@@ -43,6 +45,8 @@
 #define COMPARE_LT(x,y) do { if ((x)<(y)) return 1; if ((x)>(y)) return 0; } while(0)
 #define COMPARE_GT(x,y) COMPARE_LT(y,x)
 
+#define	ROL(x, bits) (((x) << (bits)) | ((x) >> (sizeof(uns)*8 - (bits))))	/* Bitwise rotation of an uns to the left */
+
 /* GCC Extensions */
 
 #ifdef __GNUC__
@@ -75,8 +79,9 @@
 
 extern char *log_title;			/* NULL - print no title, default is log_progname */
 extern char *log_filename;		/* Expanded name of the current log file */
-extern int log_switch_nest;		/* log_switch() nesting counter, increment to disable automatic switches */
+extern volatile int log_switch_nest;	/* log_switch() nesting counter, increment to disable automatic switches */
 extern int log_pid;			/* 0 if shouldn't be logged */
+extern int log_precise_timings;		/* Include microsecond timestamps in log messages */
 extern void (*log_die_hook)(void);
 struct tm;
 extern void (*log_switch_hook)(struct tm *tm);
@@ -135,7 +140,7 @@ static inline void log_switch_enable(void) { ASSERT(log_switch_nest); log_switch
  */
 void *xmalloc(unsigned);
 void *xrealloc(void *, unsigned);
-#define sh_xfree(x) free(x)
+void xfree(void *);
 #endif
 
 void *xmalloc_zero(unsigned);
@@ -145,10 +150,6 @@ byte *xstrdup(byte *);
 
 int match_ct_patt(byte *, byte *);
 
-/* log2.c */
-
-int fls(u32);
-
 /* wordsplit.c */
 
 int sepsplit(byte *str, byte sep, byte **rec, uns max);
@@ -172,6 +173,11 @@ void hex_to_md5(byte *, byte *);
 int isprime(uns);
 uns nextprime(uns);
 
+/* primetable.c */
+
+uns next_table_prime(uns x);
+uns prev_table_prime(uns x);
+
 /* timer.c */
 
 struct timeval;
@@ -198,14 +204,6 @@ uns random_max(uns);
 void *mmap_file(byte *name, unsigned *len, int writeable);
 void munmap_file(void *start, unsigned len);
 
-/* partmap.c */
-
-struct partmap;
-struct partmap *partmap_open(byte *name, int writeable);
-void *partmap_map(struct partmap *p, sh_off_t offset, uns size);
-void partmap_close(struct partmap *p);
-sh_off_t partmap_size(struct partmap *p);
-
 /* proctitle.c */
 
 void setproctitle_init(int argc, char **argv);