speechd-discuss
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] fixed getline prototype


From: William Hubbs
Subject: [PATCH] fixed getline prototype
Date: Fri, 11 Sep 2009 15:00:28 -0500

The prototype for getline() is visible in glibc 2.10, and in 2.9 and
earlier if _GNU_SOURCE is defined.  So, we do not need the prototype in
our source files, but we should define _GNU_SOURCE so that it is visible
no matter which version of glibc is on the system.
---
 src/modules/Makefile.am    |    2 +-
 src/modules/module_main.c  |    3 ---
 src/modules/module_utils.h |    3 ---
 3 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 579dbb8..06e3e16 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -7,7 +7,7 @@ SNDFILE_LIBS = @SNDFILE_LIBS@
 
 EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c 
festival_client.h ivona_client.c dummy.c dummy-message.wav
 
-AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" 
-I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio 
-I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ 
-Wl,--rpath -Wl,$(spdlibdir)
+AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" 
-I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio 
-I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ 
-Wl,--rpath -Wl,$(spdlibdir) -D_GNU_SOURCE
 
 modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero
 
diff --git a/src/modules/module_main.c b/src/modules/module_main.c
index 3c3ca36..312b9d7 100644
--- a/src/modules/module_main.c
+++ b/src/modules/module_main.c
@@ -21,9 +21,6 @@
  * $Id: module_main.c,v 1.17 2008-10-15 17:05:37 hanke Exp $
  */
 
-/* So that gcc doesn't comply */
-int getline(char**, size_t*, FILE*);
-
 #define PROCESS_CMD(command, function) \
 if (!strcmp(cmd_buf, #command"\n")){ \
  char *msg; \
diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h
index 3e4e75e..4798b2a 100644
--- a/src/modules/module_utils.h
+++ b/src/modules/module_utils.h
@@ -423,9 +423,6 @@ void module_report_event_pause(void);
 
 
 
-/* So that gcc doesn't complain */
-int getline(char**, size_t*, FILE*);
-
 pthread_mutex_t module_stdout_mutex;
 
 int module_utils_init(void);
-- 
1.6.3.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]