summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab-enterprises.com>2014-06-09 11:14:54 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-07-08 08:53:30 +0200
commitba4faf0498cfc0f0ff28863f40173c25bec3c8a6 (patch)
treed320367229fb599f8e454cf948492afb7eb7a07e /scilab
parentad1873fb56a85a54b8732328ba42765563b695fe (diff)
downloadscilab-ba4faf0498cfc0f0ff28863f40173c25bec3c8a6.zip
scilab-ba4faf0498cfc0f0ff28863f40173c25bec3c8a6.tar.gz
Remove the _FORTIFY_SOURCE workarounds
Change-Id: I6a314960d8f6b75f82a6df8173f6a0ccf061c01c
Diffstat (limited to 'scilab')
-rwxr-xr-xscilab/configure3
-rw-r--r--scilab/configure.ac3
-rw-r--r--scilab/modules/core/src/c/callinterf.c4
-rw-r--r--scilab/modules/core/src/c/signal_mgmt.c7
-rw-r--r--scilab/modules/core/src/c/tmpdir.c5
-rw-r--r--scilab/modules/elementary_functions/src/c/xerhlt.c4
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_copyfile.c4
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_movefile.c4
-rw-r--r--scilab/modules/fileio/src/c/getFullFilename.c3
-rw-r--r--scilab/modules/gui/src/nogui/nogui.c5
10 files changed, 12 insertions, 30 deletions
diff --git a/scilab/configure b/scilab/configure
index 60546f6..261bae7 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -9860,8 +9860,7 @@ case "$CC" in
9860 9860
9861 if test "$enable_debug_C" = yes; then 9861 if test "$enable_debug_C" = yes; then
9862 DEBUG_CFLAGS="-pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3 -Wunsafe-loop-optimizations" 9862 DEBUG_CFLAGS="-pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3 -Wunsafe-loop-optimizations"
9863 # used to be -O 9863 # used to be -O0
9864 # -D_FORTIFY_SOURCE=2
9865 case "$host" in 9864 case "$host" in
9866 *-linux-gnu ) 9865 *-linux-gnu )
9867 # Only doing that under Linux 9866 # Only doing that under Linux
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 3a6f991..4f3f5af 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -559,8 +559,7 @@ case "$CC" in
559 559
560 if test "$enable_debug_C" = yes; then 560 if test "$enable_debug_C" = yes; then
561 DEBUG_CFLAGS="-pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3 -Wunsafe-loop-optimizations" 561 DEBUG_CFLAGS="-pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3 -Wunsafe-loop-optimizations"
562 # used to be -O 562 # used to be -O0
563 # -D_FORTIFY_SOURCE=2
564 case "$host" in 563 case "$host" in
565 *-linux-gnu ) 564 *-linux-gnu )
566 # Only doing that under Linux 565 # Only doing that under Linux
diff --git a/scilab/modules/core/src/c/callinterf.c b/scilab/modules/core/src/c/callinterf.c
index 4ad609d..4361b79 100644
--- a/scilab/modules/core/src/c/callinterf.c
+++ b/scilab/modules/core/src/c/callinterf.c
@@ -11,10 +11,8 @@
11 * 11 *
12 */ 12 */
13/*--------------------------------------------------------------------------*/ 13/*--------------------------------------------------------------------------*/
14
14#include <string.h> 15#include <string.h>
15#if defined(__linux__)
16#define __USE_FORTIFY_LEVEL 0 /* Avoid dependency on GLIBC_2.11 (__longjmp_chk) */
17#endif
18#include <setjmp.h> 16#include <setjmp.h>
19#include <stdio.h> 17#include <stdio.h>
20#include <ctype.h> 18#include <ctype.h>
diff --git a/scilab/modules/core/src/c/signal_mgmt.c b/scilab/modules/core/src/c/signal_mgmt.c
index 8b378c0..cf66a57 100644
--- a/scilab/modules/core/src/c/signal_mgmt.c
+++ b/scilab/modules/core/src/c/signal_mgmt.c
@@ -17,6 +17,7 @@
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 18*/
19 19
20
20#include <stdlib.h> 21#include <stdlib.h>
21#include <stdio.h> 22#include <stdio.h>
22#include <stdarg.h> 23#include <stdarg.h>
@@ -24,10 +25,7 @@
24#include <string.h> 25#include <string.h>
25#include <libintl.h> 26#include <libintl.h>
26 27
27#if defined(__linux__) 28#include <setjmp.h>
28#define __USE_FORTIFY_LEVEL 0 /* Avoid dependency on GLIBC_2.11 (__longjmp_chk) */
29#endif
30#include <setjmp.h> /* this declaration should remain close the __USE_FORTIFY_LEVEL define */
31 29
32#include <sys/types.h> /* getpid */ 30#include <sys/types.h> /* getpid */
33#include <unistd.h> /* gethostname */ 31#include <unistd.h> /* gethostname */
@@ -36,7 +34,6 @@
36#include "localization.h" 34#include "localization.h"
37#include "backtrace.h" 35#include "backtrace.h"
38#include "signal_mgmt.h" 36#include "signal_mgmt.h"
39#include "machine.h"
40#include "Scierror.h" 37#include "Scierror.h"
41#include "suspendProcess.h" 38#include "suspendProcess.h"
42#include "scilabmode.h" 39#include "scilabmode.h"
diff --git a/scilab/modules/core/src/c/tmpdir.c b/scilab/modules/core/src/c/tmpdir.c
index a08acd9..c26ba86 100644
--- a/scilab/modules/core/src/c/tmpdir.c
+++ b/scilab/modules/core/src/c/tmpdir.c
@@ -11,6 +11,8 @@
11 * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt 11 * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
12 * 12 *
13 */ 13 */
14
15
14#include <stdio.h> 16#include <stdio.h>
15#include <string.h> 17#include <string.h>
16 18
@@ -20,9 +22,6 @@
20#endif 22#endif
21 23
22#if defined(__STDC__) || defined(_MSC_VER) 24#if defined(__STDC__) || defined(_MSC_VER)
23#if defined(__linux__)
24#define __USE_FORTIFY_LEVEL 0 /* Avoid dependency on GLIBC_2.4 (__realpath_chk) */
25#endif
26#include <stdlib.h> 25#include <stdlib.h>
27#ifndef _MSC_VER 26#ifndef _MSC_VER
28#include <sys/types.h> 27#include <sys/types.h>
diff --git a/scilab/modules/elementary_functions/src/c/xerhlt.c b/scilab/modules/elementary_functions/src/c/xerhlt.c
index 980d576..e2176b2 100644
--- a/scilab/modules/elementary_functions/src/c/xerhlt.c
+++ b/scilab/modules/elementary_functions/src/c/xerhlt.c
@@ -11,10 +11,8 @@
11 */ 11 */
12 12
13/*--------------------------------------------------------------------------*/ 13/*--------------------------------------------------------------------------*/
14
14#include <string.h> 15#include <string.h>
15#if defined(__linux__)
16#define __USE_FORTIFY_LEVEL 0 /* Avoid dependency on GLIBC_2.11 (__longjmp_chk) */
17#endif
18#include <setjmp.h> 16#include <setjmp.h>
19#include "xerhlt.h" 17#include "xerhlt.h"
20/*--------------------------------------------------------------------------*/ 18/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_copyfile.c b/scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
index 8f8f7dd..5acd573 100644
--- a/scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
+++ b/scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
@@ -10,9 +10,7 @@
10* 10*
11*/ 11*/
12/*--------------------------------------------------------------------------*/ 12/*--------------------------------------------------------------------------*/
13#if defined(__linux__) 13
14#undef _FORTIFY_SOURCE /* Avoid dependency on GLIBC_2.4 (__wcscat_chk/__wcscpy_chk) */
15#endif
16#ifndef _MSC_VER 14#ifndef _MSC_VER
17#include <errno.h> 15#include <errno.h>
18#else 16#else
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_movefile.c b/scilab/modules/fileio/sci_gateway/c/sci_movefile.c
index ca2362f..7129e62 100644
--- a/scilab/modules/fileio/sci_gateway/c/sci_movefile.c
+++ b/scilab/modules/fileio/sci_gateway/c/sci_movefile.c
@@ -10,9 +10,7 @@
10* 10*
11*/ 11*/
12/*--------------------------------------------------------------------------*/ 12/*--------------------------------------------------------------------------*/
13#if defined(__linux__) 13
14#undef _FORTIFY_SOURCE /* Avoid dependency on GLIBC_2.4 (__wcscat_chk/__wcscpy_chk) */
15#endif
16#ifndef _MSC_VER 14#ifndef _MSC_VER
17#include <errno.h> 15#include <errno.h>
18#else 16#else
diff --git a/scilab/modules/fileio/src/c/getFullFilename.c b/scilab/modules/fileio/src/c/getFullFilename.c
index 84d2bf9..874120a 100644
--- a/scilab/modules/fileio/src/c/getFullFilename.c
+++ b/scilab/modules/fileio/src/c/getFullFilename.c
@@ -10,9 +10,6 @@
10* 10*
11*/ 11*/
12/*--------------------------------------------------------------------------*/ 12/*--------------------------------------------------------------------------*/
13#if defined(__linux__)
14#undef _FORTIFY_SOURCE /* Avoid dependency on GLIBC_2.4 (__wcscat_chk/__wcscpy_chk) */
15#endif
16#include "getFullFilename.h" 13#include "getFullFilename.h"
17#include "charEncoding.h" 14#include "charEncoding.h"
18#include "MALLOC.h" 15#include "MALLOC.h"
diff --git a/scilab/modules/gui/src/nogui/nogui.c b/scilab/modules/gui/src/nogui/nogui.c
index 7fa1efc..8ba18de 100644
--- a/scilab/modules/gui/src/nogui/nogui.c
+++ b/scilab/modules/gui/src/nogui/nogui.c
@@ -15,7 +15,6 @@
15#ifndef _MSC_VER 15#ifndef _MSC_VER
16#include <errno.h> 16#include <errno.h>
17#include <stdio.h> /* fileno */ 17#include <stdio.h> /* fileno */
18#define __USE_FORTIFY_LEVEL 0 /* Avoid dependency on GLIBC_2.15 __fdelt_chk */
19#include <sys/select.h> /* fd_set */ 18#include <sys/select.h> /* fd_set */
20#include "core_math.h" /* Max */ 19#include "core_math.h" /* Max */
21#include "sciprint.h" 20#include "sciprint.h"
@@ -153,12 +152,12 @@ int Xorgetchar(int interrupt)
153 { 152 {
154 state = 0; 153 state = 0;
155 } 154 }
156 return(i); 155 return (i);
157 } 156 }
158 157
159 if (interrupt && (ismenu() == 1)) 158 if (interrupt && (ismenu() == 1))
160 { 159 {
161 return(-1); 160 return (-1);
162 } 161 }
163 162
164 } 163 }