diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:39:00 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:39:00 +0000 |
| commit | 71534fc7c42cb4f88ddc7cb6c7ca84df611e6a71 (patch) | |
| tree | 0ed1f2a45b3201158ce57815fdea78b4ee52b832 | |
| parent | 46d0ea15a4803c6a19a98dc562f3b6a1408af690 (diff) | |
INTEGRATION: CWS dmake411 (1.11.4); FILE MERGED
2007/09/23 22:05:02 vq 1.11.4.3: #i81855# More changes for the OS/2 port.
Patch provided by Yuri Dario.
2007/09/14 03:40:58 vq 1.11.4.2: #i81296# Clear flags indicating that targets that infered makefiles (and
their prerequisites) were previously build.
2007/07/24 23:00:27 vq 1.11.4.1: #i78776# New function macro $(normpath[,para] list) to normalise the
elements of list and a macro extension $(macro_name:n) to normalise
the content of macro_name. The normalization is done token-wise and
quotes are preserved.
On cygwin the result honors the setting of .WINPATH to determine the
output format. If the optional parameter para is given in the
$(normpath ...) case its expanded value is used to override the
.WINPATH setting for the output of the function macro.
| -rw-r--r-- | dmake/extern.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/dmake/extern.h b/dmake/extern.h index 019ce3fc796c..5937458d4092 100644 --- a/dmake/extern.h +++ b/dmake/extern.h @@ -1,6 +1,6 @@ /* $RCSfile: extern.h,v $ --- $Revision: 1.11 $ --- last change: $Author: obo $ $Date: 2007-06-12 06:05:25 $ +-- $Revision: 1.12 $ +-- last change: $Author: ihi $ $Date: 2007-10-15 15:39:00 $ -- -- SYNOPSIS -- External declarations for dmake functions. @@ -105,8 +105,15 @@ char *strlwr(char *p); #endif +/* from function.c */ +char *exec_normpath(char *args); + +/* from make.c */ +void Unmake(CELLPTR cp); + /* from path.c */ void Clean_path(char *path); +char *normalize_path(char *path); /* from sysintf.c */ /* cygdospath()/DO_WINPATH() are only needed for the .WINPATH attribute @@ -122,7 +129,7 @@ char *cygdospath(char *src, int winpath); /* Define some usefull macros. This is done here and not in config.h * to keep this changes usefull even when not using the autotools based * build, i.e. using config.h files that are local to the architecture. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(OS2) +#if defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(OS2) || defined(__EMX__) # define HAVE_DRIVE_LETTERS 1 #endif |