Changeset 980

Timestamp:

Sep 23, 2016, 5:50:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

samba server: adjust some mmap stuff and fix a Makefile issue

Location:

trunk/server

Files:

• lib/replace/test/shared_mmap.c (modified) (3 diffs)
• lib/util/util_file.c (modified) (1 diff)
• source3/Makefile.in (modified) (1 diff)

trunk/server/lib/replace/test/shared_mmap.c

@@ -20 +20 @@
         int *buf;
         int i; 
-        int fd = open(DATA,O_RDWR|O_CREAT|O_TRUNC,0666);
+        int fd = open(DATA,O_RDWR|O_CREAT|O_TRUNC|O_BINARY,0666);
         int count=7;
 
@@ -32 +32 @@
 
         if (fork() == 0) {
-                fd = open(DATA,O_RDWR);
+                fd = open(DATA,O_RDWR|O_BINARY);
                 if (fd == -1) exit(1);
 
@@ -48 +48 @@
         }
 
-        fd = open(DATA,O_RDWR);
+        fd = open(DATA,O_RDWR|O_BINARY);
         if (fd == -1) exit(1);
 

trunk/server/lib/util/util_file.c

@@ -227 +227 @@
 #ifdef HAVE_MMAP
         int fd;
+#ifdef __OS2__
+        fd = open(fname, O_RDONLY | O_BINARY, 0);
+#else
         fd = open(fname, O_RDONLY, 0);
+#endif
         if (fd == -1) {
                 DEBUG(2,("Failed to load %s - %s\n", fname, strerror(errno)));

trunk/server/source3/Makefile.in

@@ -2144 +2144 @@
 LIBTEVENT_STATIC_TARGET=@LIBTEVENT_STATIC_TARGET@
 LIBTEVENT_SYMS=$(srcdir)/exports/libtevent.@SYMSEXT@
-LIBTEVENT_HEADERS=$(srcdir)/@teventdir@/tevent.h $(srcdir)/@teventdir@/tevent_internal.h
+LIBTEVENT_HEADERS=@teventdir@/tevent.h @teventdir@/tevent_internal.h
 
 $(LIBTEVENT_SYMS): $(LIBTEVENT_HEADERS)