Mercurial > octave
comparison oct-conf-post.in.h @ 21229:a83e7a384ee0
create and install a subset of config.h in octave-config.h
* mk-octave-config-h.sh: New file.
* Makefile.am (EXTRA_DIST): Add mk-octave-config.h.sh to the list.
(octinclude_HEADERS): Add octave-config.h to the list.
(octave-config.h): New rule.
* common.mk (do_subst_config_vals, do_subst_cross_config_vals):
Don't substitute unused ENABLE options.
* configure.ac: Note the reason for using oct-conf-post.in.h.
Add OCTAVE_ prefix to ENABLE_BOUNDS_CHECK ENABLE_ATOMIC_REFCOUNT,
ENABLE_64, ENABLE_OPENMP, and ENABLE_FLOAT_TRUNCATE in calls to
AC_DEFINE. Change all uses.
* oct-conf-post.in.h: Define HAVE_OCTAVE_DEPRECATED_ATTR instead of
HAVE_ATTR_DEPRECATED. Likewise for HAVE_ATTR_NORETURN and
HAVE_ATTR_UNUSED. Change all uses.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 08 Feb 2016 17:30:29 -0500 |
parents | 77a622392714 |
children | 7af5ca01ecac |
comparison
equal
deleted
inserted
replaced
21228:77a622392714 | 21229:a83e7a384ee0 |
---|---|
35 standard. */ | 35 standard. */ |
36 | 36 |
37 #if defined (__GNUC__) | 37 #if defined (__GNUC__) |
38 /* The following attributes are used with gcc and clang compilers. */ | 38 /* The following attributes are used with gcc and clang compilers. */ |
39 # define OCTAVE_DEPRECATED(msg) __attribute__ ((__deprecated__ (msg))) | 39 # define OCTAVE_DEPRECATED(msg) __attribute__ ((__deprecated__ (msg))) |
40 # define HAVE_ATTR_DEPRECATED 1 | 40 # define HAVE_OCTAVE_DEPRECATED_ATTR 1 |
41 | 41 |
42 # define OCTAVE_NORETURN __attribute__ ((__noreturn__)) | 42 # define OCTAVE_NORETURN __attribute__ ((__noreturn__)) |
43 # define HAVE_ATTR_NORETURN 1 | 43 # define HAVE_OCTAVE_NORETURN_ATTR 1 |
44 | 44 |
45 # define OCTAVE_UNUSED __attribute__ ((__unused__)) | 45 # define OCTAVE_UNUSED __attribute__ ((__unused__)) |
46 # define HAVE_ATTR_UNUSED 1 | 46 # define HAVE_OCTAVE_UNUSED_ATTR 1 |
47 #else | 47 #else |
48 # define OCTAVE_DEPRECATED(msg) | 48 # define OCTAVE_DEPRECATED(msg) |
49 # define OCTAVE_NORETURN | 49 # define OCTAVE_NORETURN |
50 # define OCTAVE_UNUSED | 50 # define OCTAVE_UNUSED |
51 #endif | 51 #endif |
98 | 98 |
99 #if 0 | 99 #if 0 |
100 # define F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION | 100 # define F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION |
101 #endif | 101 #endif |
102 | 102 |
103 #if defined (ENABLE_64) | 103 #if defined (OCTAVE_ENABLE_64) |
104 # define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT64_T | 104 # define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT64_T |
105 #else | 105 #else |
106 # define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT | 106 # define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT |
107 #endif | 107 #endif |
108 | 108 |
159 # define OCTGUI_API OCTAVE_IMPORT | 159 # define OCTGUI_API OCTAVE_IMPORT |
160 #endif | 160 #endif |
161 | 161 |
162 /* Backward compatibility */ | 162 /* Backward compatibility */ |
163 | 163 |
164 #if defined (ENABLE_ATOMIC_REFCOUNT) | 164 #if defined (OCTAVE_ENABLE_ATOMIC_REFCOUNT) |
165 # define USE_ATOMIC_REFCOUNT 1 | 165 # define USE_ATOMIC_REFCOUNT 1 |
166 #endif | 166 #endif |
167 | 167 |
168 #if defined (ENABLE_64) | 168 #if defined (OCTAVE_ENABLE_64) |
169 # define USE_64_BIT_IDX_T 1 | 169 # define USE_64_BIT_IDX_T 1 |
170 #endif | 170 #endif |
171 | 171 |
172 #if defined (ENABLE_OPENMP) | 172 #if defined (OCTAVE_ENABLE_OPENMP) |
173 # define HAVE_OPENMP 1 | 173 # define HAVE_OPENMP 1 |
174 #endif | 174 #endif |
175 | 175 |
176 #if defined (ENABLE_FLOAT_TRUNCATE) | 176 #if defined (OCTAVE_ENABLE_FLOAT_TRUNCATE) |
177 # define OCTAVE_FLOAT_TRUNCATE volatile | 177 # define OCTAVE_FLOAT_TRUNCATE volatile |
178 #else | 178 #else |
179 # define OCTAVE_FLOAT_TRUNCATE | 179 # define OCTAVE_FLOAT_TRUNCATE |
180 #endif | 180 #endif |
181 | 181 |