From mint-bounce@lists.fishpool.fi  Mon Mar 17 10:29:33 2008
X-Virus-Scanned: amavisd-new at demon.co.uk
Subject: [MiNT] remove 64bit declaration from include/glob.h
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
To: mint <mint@fishpool.com>
Content-Type: multipart/mixed; boundary="=-bjgEBDS0CAbIrPUBVxrt"
Date: Mon, 17 Mar 2008 14:23:36 +0000
Message-Id: <1205763816.14873.8.camel@localhost>
Mime-Version: 1.0
X-Mailer: Evolution 2.12.3 
X-ecartis-version: Ecartis v1.0.0
Sender: mint-bounce@lists.fishpool.fi
Errors-to: mint-bounce@lists.fishpool.fi
X-original-sender: alanh@fairlite.demon.co.uk
Precedence: bulk
List-help: <mailto:ecartis@lists.fishpool.fi?Subject=help>
List-unsubscribe: <mailto:mint-request@lists.fishpool.fi?Subject=unsubscribe>
List-Id: <mint.lists.fishpool.fi>
X-List-ID: <mint.lists.fishpool.fi>
List-subscribe: <mailto:mint-request@lists.fishpool.fi?Subject=subscribe>
List-owner: <mailto:tjhukkan@fishpool.fi>
List-post: <mailto:mint@lists.fishpool.fi>


--=-bjgEBDS0CAbIrPUBVxrt
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

If _FILE_OFFSET_BITS=64 then the declarations in include/glob.h get
changed to export to applications glob64/globfree64 which don't exist in
MiNTlib.

Alan.

--=-bjgEBDS0CAbIrPUBVxrt
Content-Disposition: attachment; filename=glob.h.patch
Content-Type: text/x-patch; name=glob.h.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: include/glob.h
===================================================================
RCS file: /mint/mintlib/include/glob.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 glob.h
--- include/glob.h	12 Oct 2000 10:56:30 -0000	1.1.1.1
+++ include/glob.h	17 Mar 2008 14:22:09 -0000
@@ -121,25 +121,6 @@
     int (*gl_stat) __PMT ((__const char *, struct stat *));
   } glob_t;
 
-#ifdef _LARGEFILE64_SOURCE
-struct stat64;
-typedef struct
-  {
-    __size_t gl_pathc;
-    char **gl_pathv;
-    __size_t gl_offs;
-    int gl_flags;
-
-    /* If the GLOB_ALTDIRFUNC flag is set, the following functions
-       are used instead of the normal file access functions.  */
-    void (*gl_closedir) __PMT ((void *));
-    struct dirent64 *(*gl_readdir) __PMT ((void *));
-    __ptr_t (*gl_opendir) __PMT ((__const char *));
-    int (*gl_lstat) __PMT ((__const char *, struct stat64 *));
-    int (*gl_stat) __PMT ((__const char *, struct stat64 *));
-  } glob64_t;
-#endif
-
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
    If a directory cannot be opened or read and ERRFUNC is not nil,
@@ -148,34 +129,12 @@
    `glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
    If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
    Otherwise, `glob' returns zero.  */
-#if _FILE_OFFSET_BITS != 64
 extern int glob __P ((__const char *__pattern, int __flags,
 		      int (*__errfunc) (__const char *, int),
 		      glob_t *__pglob));
 
 /* Free storage allocated in PGLOB by a previous `glob' call.  */
 extern void globfree __P ((glob_t *__pglob));
-#else
-# if __GNUC__ >= 2
-extern int glob __P ((__const char *__pattern, int __flags,
-		      int (*__errfunc) (__const char *, int),
-		      glob_t *__pglob)) __asm__ ("glob64");
-
-extern void globfree __P ((glob_t *__pglob)) __asm__ ("globfree64");
-# else
-#  define glob glob64
-#  define globfree globfree64
-# endif
-#endif
-
-#ifdef _LARGEFILE64_SOURCE
-extern int glob64 __P ((__const char *__pattern, int __flags,
-			int (*__errfunc) (__const char *, int),
-			glob64_t *__pglob));
-
-extern void globfree64 __P ((glob64_t *__pglob));
-#endif
-
 
 #ifdef _GNU_SOURCE
 /* Return nonzero if PATTERN contains any metacharacters.

--=-bjgEBDS0CAbIrPUBVxrt--