You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/12/01 08:40:35 UTC
[openoffice] branch AOO41X updated: Changed CRLF -> LF
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new da439f6996 Changed CRLF -> LF
da439f6996 is described below
commit da439f6996c72f3fb464b46d48692ea96ddef43b
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Dec 1 09:40:13 2022 +0100
Changed CRLF -> LF
---
main/solenv/src/dmake-cygwin64.patch | 96 ++++++++++++++++++------------------
1 file changed, 48 insertions(+), 48 deletions(-)
diff --git a/main/solenv/src/dmake-cygwin64.patch b/main/solenv/src/dmake-cygwin64.patch
index 31b6eedb99..3f941f2f0a 100644
--- a/main/solenv/src/dmake-cygwin64.patch
+++ b/main/solenv/src/dmake-cygwin64.patch
@@ -1,48 +1,48 @@
-diff -Nur path.c path.c
---- path.c 2011-09-25 18:53:42.000000000 +0200
-+++ path.c 2018-03-04 08:13:24.836905800 +0200
-@@ -317,8 +317,8 @@
- #if __CYGWIN__
- /* Use cygwin function to convert a DOS path to a POSIX path. */
- if( *path && path[1] == ':' && isalpha(*path) ) {
-- int err = cygwin_conv_to_posix_path(path, cpath);
-- if (err)
-+ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, path, cpath, PATH_MAX);
-+ if (err < 0)
- Fatal( "error converting \"%s\" - %s\n",
- path, strerror (errno));
- if( path[2] != '/' && path[2] != '\\' )
-diff -Nur sysintf.c sysintf.c
---- sysintf.c 2011-09-25 18:53:42.000000000 +0200
-+++ sysintf.c 2018-03-04 08:15:54.315421400 +0200
-@@ -69,7 +69,7 @@
- # include <sys/timeb.h>
- #endif
-
--/* for cygwin_conv_to_posix_path() in Prolog() and for cygdospath()*/
-+/* for cygwin_conv_path() in Prolog() and for cygdospath()*/
- #if __CYGWIN__
- # include <sys/cygwin.h>
- #endif
-@@ -538,8 +538,8 @@
- if ( (CygDrvPre = MALLOC( PATH_MAX, char)) == NIL(char) )
- No_ram();
- else {
-- int err = cygwin_conv_to_posix_path("c:", CygDrvPre);
-- if (err)
-+ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, "c:", CygDrvPre, PATH_MAX);
-+ if (err < 0)
- Fatal( "error converting \"%s\" - %s\n",
- CygDrvPre, strerror (errno));
- if( (CygDrvPreLen = strlen(CygDrvPre)) == 2 ) {
-@@ -1144,8 +1144,8 @@
-
- if( *src && src[0] == '/' ) {
- char *tmp;
-- int err = cygwin_conv_to_win32_path(src, buf);
-- if (err)
-+ int err = cygwin_conv_path(CCP_POSIX_TO_WIN_A, src, buf, PATH_MAX);
-+ if (err < 0)
- Fatal( "error converting \"%s\" - %s\n",
- src, strerror (errno));
-
+diff -Nur path.c path.c
+--- path.c 2011-09-25 18:53:42.000000000 +0200
++++ path.c 2018-03-04 08:13:24.836905800 +0200
+@@ -317,8 +317,8 @@
+ #if __CYGWIN__
+ /* Use cygwin function to convert a DOS path to a POSIX path. */
+ if( *path && path[1] == ':' && isalpha(*path) ) {
+- int err = cygwin_conv_to_posix_path(path, cpath);
+- if (err)
++ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, path, cpath, PATH_MAX);
++ if (err < 0)
+ Fatal( "error converting \"%s\" - %s\n",
+ path, strerror (errno));
+ if( path[2] != '/' && path[2] != '\\' )
+diff -Nur sysintf.c sysintf.c
+--- sysintf.c 2011-09-25 18:53:42.000000000 +0200
++++ sysintf.c 2018-03-04 08:15:54.315421400 +0200
+@@ -69,7 +69,7 @@
+ # include <sys/timeb.h>
+ #endif
+
+-/* for cygwin_conv_to_posix_path() in Prolog() and for cygdospath()*/
++/* for cygwin_conv_path() in Prolog() and for cygdospath()*/
+ #if __CYGWIN__
+ # include <sys/cygwin.h>
+ #endif
+@@ -538,8 +538,8 @@
+ if ( (CygDrvPre = MALLOC( PATH_MAX, char)) == NIL(char) )
+ No_ram();
+ else {
+- int err = cygwin_conv_to_posix_path("c:", CygDrvPre);
+- if (err)
++ int err = cygwin_conv_path(CCP_WIN_A_TO_POSIX, "c:", CygDrvPre, PATH_MAX);
++ if (err < 0)
+ Fatal( "error converting \"%s\" - %s\n",
+ CygDrvPre, strerror (errno));
+ if( (CygDrvPreLen = strlen(CygDrvPre)) == 2 ) {
+@@ -1144,8 +1144,8 @@
+
+ if( *src && src[0] == '/' ) {
+ char *tmp;
+- int err = cygwin_conv_to_win32_path(src, buf);
+- if (err)
++ int err = cygwin_conv_path(CCP_POSIX_TO_WIN_A, src, buf, PATH_MAX);
++ if (err < 0)
+ Fatal( "error converting \"%s\" - %s\n",
+ src, strerror (errno));
+
\ No newline at end of file