Update of /cvsroot/arcem/arcem
In directory vz-cvs-4.sog:/tmp/cvs-serv15612
Modified Files:
Makefile hostfs.c
Log Message:
Small tweaks to allow X11 build to build & run on OSX once again.
Index: hostfs.c
===================================================================
RCS file: /cvsroot/arcem/arcem/hostfs.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- hostfs.c 12 May 2012 17:34:51 -0000 1.19
+++ hostfs.c 21 Jul 2012 12:20:22 -0000 1.20
@@ -57,10 +57,7 @@
#define HOST_DIR_SEP_CHAR '.'
#define HOST_DIR_SEP_STR "."
-/* ftello64/fseeko64 don't exist, but ftello/fseeko do. Likewise, we need to
use regular fopen. */
-#define ftello64 ftello
-#define fseeko64 fseeko
-#define fopen64 fopen
+#define NO_OPEN64
#else /* __riscos__ */
@@ -71,6 +68,14 @@
#include "hostfs.h"
+#if defined NO_OPEN64 || defined __MACH__
+/* ftello64/fseeko64 don't exist, but ftello/fseeko do. Likewise, we need to
use regular fopen. */
+#define ftello64 ftello
+#define fseeko64 fseeko
+#define fopen64 fopen
+#define off64_t uint32_t
+#endif
+
#ifdef HOSTFS_ARCEM
#include "arch/armarc.h"
@@ -88,7 +93,7 @@
#endif /* !HOSTFS_ARCEM */
-#define HOSTFS_PROTOCOL_VERSION 1
+#define HOSTFS_PROTOCOL_VERSION 1
/* Windows mkdir() function only takes one argument name, and
name clashes with Posix mkdir() function taking two. This
@@ -99,9 +104,9 @@
/** Registration states of HostFS module with backend code */
typedef enum {
- HOSTFS_STATE_UNREGISTERED, /**< Module not yet registered */
- HOSTFS_STATE_REGISTERED, /**< Module successfully registered */
- HOSTFS_STATE_IGNORE, /**< Ignoring activity after failing to
register */
+ HOSTFS_STATE_UNREGISTERED, /**< Module not yet registered */
+ HOSTFS_STATE_REGISTERED, /**< Module successfully registered */
+ HOSTFS_STATE_IGNORE, /**< Ignoring activity after failing to register */
} HostFSState;
enum OBJECT_TYPE {
@@ -1760,10 +1765,10 @@
cache_entries[entry_ptr].object_info.attribs = gbpb_buffer.attribs;
unsigned string_space;
-
+
/* Calculate space required to store name (+ terminator) */
string_space = strlen(gbpb_buffer.name) + 1;
-
+
/* Check whether cache_names[] is large enough; increase if required */
if (string_space > (cache_names_capacity - name_ptr)) {
cache_names_capacity *= 2;
@@ -1773,14 +1778,14 @@
exit(1);
}
}
-
+
/* Copy string into cache_names[]. Put offset ptr into local_entries[] */
strcpy(cache_names + name_ptr, gbpb_buffer.name);
cache_entries[entry_ptr].name_offset = name_ptr;
-
+
/* Advance name_ptr */
name_ptr += string_space;
-
+
/* Advance entry_ptr, increasing space of cache_entries[] if required */
entry_ptr++;
if (entry_ptr == cache_entries_capacity) {
Index: Makefile
===================================================================
RCS file: /cvsroot/arcem/arcem/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile 21 Jul 2012 01:03:31 -0000 1.41
+++ Makefile 21 Jul 2012 12:20:22 -0000 1.42
@@ -151,7 +151,10 @@
endif
ifeq (${SYSTEM},X)
-CFLAGS += -DSYSTEM_X -I/usr/X11R6/include -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS += -DSYSTEM_X -I/usr/X11R6/include
+ifneq ($(shell uname),Darwin)
+CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+endif
LIBS += -L/usr/X11R6/lib -lXext -lX11
OBJS += X/true.o X/pseudo.o
#SOUND_SUPPORT = yes
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
--
arcem-cvs mailing list
arcem-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/arcem-cvs
