| 2 | 2 |
|
| 3 | 3 |
Last-Update: <2014-11-15>
|
| 4 | 4 |
|
| 5 | |
--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/configure.in
|
| 6 | |
+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/configure.in
|
| 7 | |
@@ -357,7 +357,7 @@ AC_MSG_CHECKING(if system libc has GNU g
|
| 8 | |
AC_CACHE_VAL(make_cv_sys_gnu_glob, [
|
| 9 | |
AC_EGREP_CPP(gnu glob,[
|
| 10 | |
#include <features.h>
|
| 11 | |
-#include <glob.h>
|
| 12 | |
+#include "glob/glob.h"
|
| 13 | |
#include <fnmatch.h>
|
| 14 | |
|
| 15 | |
#define GLOB_INTERFACE_VERSION 1
|
| 16 | |
--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/expreval.c
|
| 17 | |
+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/expreval.c
|
| 18 | |
@@ -30,7 +30,7 @@
|
| 19 | |
#include "make.h"
|
| 20 | |
#include <assert.h>
|
| 21 | |
|
| 22 | |
-#include <glob.h>
|
| 23 | |
+#include "glob/glob.h"
|
| 24 | |
|
| 25 | |
#include "dep.h"
|
| 26 | |
#include "filedef.h"
|
| 27 | |
--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/glob/glob.c
|
| 28 | |
+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/glob/glob.c
|
| 29 | |
@@ -25,7 +25,7 @@ USA. */
|
| 30 | |
# include <config.h>
|
|
5 |
diff --git a/src/kmk/dir.c b/src/kmk/dir.c
|
|
6 |
index 2bef610..2c39119 100644
|
|
7 |
--- a/src/kmk/dir.c
|
|
8 |
+++ b/src/kmk/dir.c
|
|
9 |
@@ -1449,7 +1449,7 @@ dir_setup_glob (glob_t *gl)
|
|
10 |
#ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
|
|
11 |
gl->gl_lstat = local_stat;
|
| 31 | 12 |
#endif
|
| 32 | |
|
| 33 | |
-/* Enable GNU extensions in glob.h. */
|
| 34 | |
+/* Enable GNU extensions in "glob.h". */
|
| 35 | |
#ifndef _GNU_SOURCE
|
| 36 | |
# define _GNU_SOURCE 1
|
|
13 |
-#if defined(KMK) && !defined(__OS2__)
|
|
14 |
+#if defined(WINDOWS32) && defined(KMK) && !defined(__OS2__)
|
|
15 |
gl->gl_exists = file_exists_p;
|
|
16 |
gl->gl_isdir = dir_exists_p;
|
| 37 | 17 |
#endif
|
| 38 | |
@@ -271,7 +271,7 @@ extern char *alloca ();
|
| 39 | |
#include <fnmatch.h>
|
| 40 | |
|
| 41 | |
/* Some system header files erroneously define these.
|
| 42 | |
- We want our own definitions from <glob.h> to take precedence. */
|
| 43 | |
+ We want our own definitions from "glob.h" to take precedence. */
|
| 44 | |
#ifndef __GNU_LIBRARY__
|
| 45 | |
# undef GLOB_ERR
|
| 46 | |
# undef GLOB_MARK
|
| 47 | |
@@ -282,7 +282,7 @@ extern char *alloca ();
|
| 48 | |
# undef GLOB_NOESCAPE
|
| 49 | |
# undef GLOB_PERIOD
|
| 50 | |
#endif
|
| 51 | |
-#include <glob.h>
|
| 52 | |
+#include "glob.h"
|
| 53 | |
|
| 54 | |
#ifdef HAVE_GETLOGIN_R
|
| 55 | |
extern int getlogin_r __P ((char *, size_t));
|
| 56 | |
--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/incdep.c
|
| 57 | |
+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/incdep.c
|
| 58 | |
@@ -40,7 +40,7 @@
|
| 59 | |
|
| 60 | |
#include <assert.h>
|
| 61 | |
|
| 62 | |
-#include <glob.h>
|
| 63 | |
+#include "glob/glob.h"
|
| 64 | |
|
| 65 | |
#include "dep.h"
|
| 66 | |
#include "filedef.h"
|
| 67 | |
--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/kdepdb.c
|
| 68 | |
+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/kdepdb.c
|
| 69 | |
@@ -30,7 +30,7 @@
|
| 70 | |
#include "../lib/k/kDefs.h"
|
| 71 | |
#include "../lib/k/kTypes.h"
|
| 72 | |
#include <assert.h>
|
| 73 | |
-#include <glob.h>
|
| 74 | |
+#include "glob/glob.h"
|
| 75 | |
|
| 76 | |
#include "dep.h"
|
| 77 | |
#include "filedef.h"
|
| 78 | |
--- kbuild-0.1.9998svn2734+dfsg.orig/src/kmk/read.c
|
| 79 | |
+++ kbuild-0.1.9998svn2734+dfsg/src/kmk/read.c
|
| 80 | |
@@ -20,7 +20,7 @@ this program. If not, see <http://www.g
|
| 81 | |
|
| 82 | |
#include <assert.h>
|
| 83 | |
|
| 84 | |
-#include <glob.h>
|
| 85 | |
+#include "glob/glob.h"
|
| 86 | |
|
| 87 | |
#include "dep.h"
|
| 88 | |
#include "filedef.h"
|