summaryrefslogtreecommitdiff
path: root/lang/python24/patches/patch-ad
blob: 112442919b1172c5650cdb3d5b61926303973a58 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
$NetBSD: patch-ad,v 1.2 2006/04/12 20:21:48 drochner Exp $

--- Lib/posixfile.py.orig	Wed Aug 18 17:13:40 2004
+++ Lib/posixfile.py
@@ -183,10 +183,11 @@ class _posixfile_:
         # additions for AIX by Vladimir.Marangozov@imag.fr
         import sys, os
         if sys.platform in ('netbsd1',
+                            'netbsd2', 'netbsd3',
                             'openbsd2',
                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                             'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'):
-            flock = struct.pack('lxxxxlxxxxlhh', \
+            flock = struct.pack('qqihh', \
                   l_start, l_len, os.getpid(), l_type, l_whence)
         elif sys.platform in ['aix3', 'aix4']:
             flock = struct.pack('hhlllii', \
@@ -199,11 +200,12 @@ class _posixfile_:
 
         if '?' in how:
             if sys.platform in ('netbsd1',
+                                'netbsd2', 'netbsd3',
                                 'openbsd2',
                                 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                                 'bsdos2', 'bsdos3', 'bsdos4'):
                 l_start, l_len, l_pid, l_type, l_whence = \
-                    struct.unpack('lxxxxlxxxxlhh', flock)
+                    struct.unpack('qqihh', flock)
             elif sys.platform in ['aix3', 'aix4']:
                 l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \
                     struct.unpack('hhlllii', flock)