--- parser3/src/include/pa_common.h	2001/11/05 11:46:23	1.60
+++ parser3/src/include/pa_common.h	2002/01/25 12:09:04	1.71
@@ -4,18 +4,25 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_common.h,v 1.60 2001/11/05 11:46:23 paf Exp $
+	$Id: pa_common.h,v 1.71 2002/01/25 12:09:04 paf Exp $
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-#include "pa_config_includes.h"
 #include "pa_pool.h"
 #include "pa_string.h"
 
 class Value;
 
+// replace system s*nprintf with our versions
+#undef vsnprintf 
+int __vsnprintf(char *, size_t, const char *, va_list);
+#define vsnprintf __vsnprintf 
+#undef snprintf
+int __snprintf(char *, size_t, const char *, ...);
+#define snprintf __snprintf
+
 #if _MSC_VER
 /*
 inline int open( const char *filename, int oflag ) { return _open(filename, oflag); }
@@ -26,15 +33,6 @@ inline int stat( const char *path, struc
 inline long lseek( int handle, long offset, int origin ) { return _lseek(handle, offset, origin); }
 */
 
-#ifndef vsnprintf
-int __vsnprintf(char *, size_t, const char *, va_list);
-#	define vsnprintf __vsnprintf 
-#endif
-#ifndef snprintf
-int __snprintf(char *, size_t, const char *, ...);
-#	define snprintf __snprintf
-#endif
-
 //access
 #define F_OK 0
 #define X_OK 1
@@ -57,13 +55,26 @@ int __snprintf(char *, size_t, const cha
 
 #endif
 
-#ifndef HAVE_TRUNC
+#ifdef HAVE_TRUNC
+#	ifndef trunc
+extern "C" double trunc(double);
+#	endif
+#else
 inline double trunc(double param) { return param > 0? floor(param) : ceil(param); }
 #endif
-#ifndef HAVE_ROUND
+
+#ifdef HAVE_ROUND
+#	ifndef round
+extern "C" double round(double);
+#	endif
+#else
 inline double round(double param) { return floor(param+0.5); }
 #endif
-#ifndef HAVE_SIGN
+#ifdef HAVE_SIGN
+#	ifndef sign
+extern "C" double sign(double);
+#	endif
+#else
 inline double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); }
 #endif
 
@@ -72,8 +83,8 @@ inline double sign(double param) { retur
 	can't say that about other systems/ line break styles
 */
 void fix_line_breaks(
-					 char *cstr,  ///< nevertheless must be 0 ended
-					 size_t& size ///< used to speedup next actions
+					 char *buf,
+					 size_t& size ///< may change! used to speedup next actions
 					 );
 
 /**
@@ -95,26 +106,36 @@ bool file_read(Pool& pool, const String&
 			   size_t offset=0, size_t limit=0);
 
 /**
-	write data to specified file using pool, 
+	lock specified file exclusively, 
+	do actions under lock.
+	throws an exception in case of problems
+*/
+void file_action_under_lock(
+				const String& file_spec, 
+				const char *action_name, void (*action)(int, void *), void *context=0,
+				bool as_text=false,
+				bool do_append=false);
+
+/**
+	write data to specified file, 
 	throws an exception in case of problems
 */
-void file_write(Pool& pool, 
+void file_write(
 				const String& file_spec,
 				const void *data, size_t size, 
 				bool as_text,
-				bool do_append=false/*,
-				bool exclusive=false*/);
+				bool do_append=false);
 
 /**
 	delete specified file 
 	throws an exception in case of problems
 */
-void file_delete(Pool& pool, const String& file_spec);
+bool file_delete(const String& file_spec, bool fail_on_read_problem=true);
 /**
 	move specified file 
 	throws an exception in case of problems
 */
-void file_move(Pool& pool, const String& old_spec, const String& new_spec);
+void file_move(const String& old_spec, const String& new_spec);
 
 bool file_readable(const String& file_spec);
 bool dir_readable(const String& file_spec);