Small fixes for the AmigaOS4 build to work

source_code/smb_abstraction.c

@@ -20,6 +20,16 @@
 
 /*****************************************************************************/
 
+#ifndef min
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif /* min */
+
+#ifndef max
+#define max(a,b) ((a) > (b) ? (a) : (b))
+#endif /* max */
+
+/*****************************************************************************/
+
 #define ATTR_CACHE_TIME		5	/* cache attributes for this time (seconds) */
 #define DIR_CACHE_TIME		5	/* cache directories for this time (seconds) */
 #define DIRCACHE_SIZE		170

source_code/sock.c

@@ -10,6 +10,22 @@
 
 #include "smbfs.h"
 
+/****************************************************************************/
+
+/* A quick workaround for the timeval/timerequest->TimeVal/TimeRequest
+   change in the recent OS4 header files. */
+#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
+
+#define timeval		TimeVal
+#define tv_secs		Seconds
+#define tv_micro	Microseconds
+
+#define timerequest	TimeRequest
+#define tr_node		Request
+#define tr_time		Time
+
+#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
+
 /*****************************************************************************/
 
 #include <smb/smb_fs.h>