Merge pull request #256 from flaviojs/fix-compilation-udp_recv-udp_send

Fix compilation of udp_recv and udp_send.
GNS3 · Oct 5, 2024 · ed80796 · ed80796
2 parents 41cf5ce + c89eec0
commit ed80796
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/common/dynamips.c b/common/dynamips.c
@@ -82,7 +82,6 @@ char *hypervisor_ip_address = NULL;
 
 /* Log file */
 char *log_file_name = NULL;
-FILE *log_file = NULL;
 
 /* VM flags */
 volatile int vm_save_state = 0;

diff --git a/common/dynamips.h b/common/dynamips.h
@@ -47,9 +47,6 @@ struct symbol {
 /* ROM identification tag */
 #define ROM_ID  0x1e94b3df
 
-/* Global log file */
-extern FILE *log_file;
-
 /* Operating system name */
 extern const char *os_name;
 

diff --git a/common/utils.c b/common/utils.c
@@ -32,7 +32,7 @@
 
 #include "utils.h"
 
-extern FILE *log_file;
+FILE *log_file = NULL;
 
 /* Add an element to a list */
 m_list_t *m_list_add(m_list_t **head,void *data)

diff --git a/stable/utils.h b/stable/utils.h
@@ -12,6 +12,9 @@
 #include <netinet/in.h>
 #include <signal.h>
 
+/* Global log file */
+extern FILE *log_file;
+
 /* Host CPU Types */
 #define CPU_x86    0
 #define CPU_amd64  1

diff --git a/unstable/utils.h b/unstable/utils.h
@@ -12,6 +12,9 @@
 #include <netinet/in.h>
 #include <signal.h>
 
+/* Global log file */
+extern FILE *log_file;
+
 /* Host CPU Types */
 #define CPU_x86    0
 #define CPU_amd64  1