diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-09-21 18:37:10 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-09-21 18:37:10 +0200 |
| commit | 09d5e073a1f9deb9089f614e8385ad9799808b5b (patch) | |
| tree | 939e4c6e80fabe67d006b753f4f9cd0d4da1fad3 /nx-X11 | |
| parent | 8d4d2bc20e06ee255d2ca07b9e003b02276047c0 (diff) | |
| download | nx-libs-09d5e073a1f9deb9089f614e8385ad9799808b5b.tar.gz nx-libs-09d5e073a1f9deb9089f614e8385ad9799808b5b.tar.bz2 nx-libs-09d5e073a1f9deb9089f614e8385ad9799808b5b.zip | |
remove misc dir
xserver upstream has included the required files. So do we.
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/programs/Xserver/os/Imakefile | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/strlcat.c (renamed from nx-X11/lib/misc/strlcat.c) | 0 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/strlcpy.c (renamed from nx-X11/lib/misc/strlcpy.c) | 0 |
3 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 60a005fb6..b1873b8fd 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -190,11 +190,6 @@ SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES)) LinkSourceFile(snprintf.c,$(LIBSRC)/misc) #endif -#if !HasStrlcat -LinkSourceFile(strlcat.c,$(LIBSRC)/misc) -LinkSourceFile(strlcpy.c,$(LIBSRC)/misc) -#endif - #if DoLoadableServer AllTarget(libcwrapper.o) ObjectFromSpecialSource(libcwrapper,$(XF86OSSRC)/shared/libc_wrapper,-DSELF_CONTAINED_WRAPPER) diff --git a/nx-X11/lib/misc/strlcat.c b/nx-X11/programs/Xserver/os/strlcat.c index 28e2338f9..28e2338f9 100644 --- a/nx-X11/lib/misc/strlcat.c +++ b/nx-X11/programs/Xserver/os/strlcat.c diff --git a/nx-X11/lib/misc/strlcpy.c b/nx-X11/programs/Xserver/os/strlcpy.c index 42442cc30..42442cc30 100644 --- a/nx-X11/lib/misc/strlcpy.c +++ b/nx-X11/programs/Xserver/os/strlcpy.c |