Changeset 258:d5b37ea1e679 in mediastreamer2

Timestamp:

Feb 16, 2009 11:56:01 AM (4 years ago)

Author:

strk <strk@…>

Branch:

default

Message:

Fix HAVE_READLINE define setting

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@261 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/console

Files:

• linphonec.c (modified) (3 diffs)
• linphonec.h (modified) (1 diff)

linphone/console/linphonec.c

@@ -36 +36 @@
 #include <linphonecore.h>
 #include "linphonec.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #ifdef WIN32
@@ -143 +139 @@
 char prompt[PROMPT_MAX_LEN];
 char sock_unix_path[128]={0};
+
+#ifndef HAVE_READLINE
 static ortp_thread_t net_reader_th;
 static bool_t net_reader_run=FALSE;
 static ortp_socket_t server_sock;
+#endif
 
 LinphoneCoreVTable linphonec_vtable = {
@@ -673 +672 @@
 #ifdef HAVE_READLINE
         linphonec_finish_readline();
-#endif
-
+#else
         if (net_reader_run)
                 stop_net_reader();
+#endif
+
+
         linphone_core_uninit (&linphonec);
 

linphone/console/linphonec.h

@@ -25 +25 @@
 #ifndef LINPHONEC_H
 #define LINPHONEC_H 1
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #ifdef HAVE_READLINE_H