Changeset 2a301ff for libcfa/prelude/bootloader.cf

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• libcfa/prelude/bootloader.cf (modified) (2 diffs)

libcfa/prelude/bootloader.cf

@@ -1 @@
-extern "C" { static inline int invoke_main(int argc, char* argv[], char* envp[]); }
+extern "C" { static inline int invoke_main( int argc, char * argv[], char * envp[]); }
 int cfa_args_argc;
 char ** cfa_args_argv;
@@ -5 +5 @@
 __attribute__((weak)) extern int cfa_main_returned;
 
-int main(int argc, char* argv[], char* envp[]) {
+int main( int argc, char * argv[], char * envp[] ) {
         cfa_args_argc = argc;
         cfa_args_argv = argv;
         cfa_args_envp = envp;
         int ret = invoke_main(argc, argv, envp);
-        if(&cfa_main_returned) cfa_main_returned = 1;
+        if( &cfa_main_returned ) cfa_main_returned = 1;
         return ret;
 }