Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
clean-compiler-and-rts
compiler
Commits
47fcb797
Commit
47fcb797
authored
Jul 13, 2004
by
John van Groningen
Browse files
remove syntax problem caused by cvs
parent
c0179239
Changes
1
Hide whitespace changes
Inline
Side-by-side
backendC/CleanCompilerSources/mac_io.c
View file @
47fcb797
...
...
@@ -804,7 +804,6 @@ extern char *clean_abc_path; /* imported from clm.c */
}
#endif
<<<<<<<
mac_io
.
c
#if defined (GNU_C)
static
FILE
*
fopen_with_file_name_conversion
(
char
*
file_name
,
char
*
mode
)
{
...
...
@@ -829,46 +828,6 @@ static FILE *fopen_with_file_name_conversion (char *file_name,char *mode)
# define fopen fopen_with_file_name_conversion
#endif
=======
#if defined (GNU_C)
static
FILE
*
fopen_with_file_name_conversion
(
char
*
file_name
,
char
*
mode
)
{
FSSpec
fs_spec
;
FSRef
fs_ref
;
CFURLRef
CFURL_ref
;
char
buffer
[
512
+
1
];
int
string_size
;
Boolean
r
;
OSErr
e
;
buffer
[
0
]
=
strlen
(
file_name
);
strcpy
(
&
buffer
[
1
],
file_name
);
e
=
FSMakeFSSpec
(
0
/*vRefNum*/
,
0
/*dirID*/
,
buffer
,
&
fs_spec
);
if
(
e
!=
noErr
)
return
NULL
;
e
=
FSpMakeFSRef
(
&
fs_spec
,
&
fs_ref
);
if
(
e
!=
noErr
)
return
NULL
;
CFURL_ref
=
CFURLCreateFromFSRef
(
NULL
,
&
fs_ref
);
string_size
=
512
;
r
=
CFURLGetFileSystemRepresentation
(
CFURL_ref
,
1
,
buffer
,
string_size
);
if
(
!
r
)
return
NULL
;
file_name
=
buffer
;
return
fopen
(
file_name
,
mode
);
}
# define fopen fopen_with_file_name_conversion
#endif
>>>>>>>
1
.
4
#if WRITE_DCL_MODIFICATION_TIME
File
FOpenWithFileTime
(
char
*
file_name
,
FileKind
kind
,
char
*
mode
,
FileTime
*
file_time_p
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment