Skip to content
GitLab
Commit a3ce8c8a authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed errors with gcc -fno-common option.

parent 75b9de5a
Show whitespace changes
Inline Side-by-side
src/psf.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1998-2015 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1998-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 15/12/2015 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -50,7 +50,10 @@ ...@@ -50,7 +50,10 @@
extern keystruct objkey[]; extern keystruct objkey[];
extern objstruct outobj;
psfstruct *psf,*thedpsf,*thepsf;
psfitstruct *thepsfit,*thedpsfit;
PIXTYPE *checkmask;
/********************************* psf_init **********************************/ /********************************* psf_init **********************************/
/* /*
......
src/psf.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1998-2014 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1998-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 15/12/2015 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -104,9 +104,9 @@ typedef struct ...@@ -104,9 +104,9 @@ typedef struct
} psfitstruct; } psfitstruct;
/*----------------------------- Global variables ----------------------------*/ /*----------------------------- Global variables ----------------------------*/
psfstruct *psf,*thedpsf,*thepsf; extern psfstruct *psf,*thedpsf,*thepsf;
psfitstruct *thepsfit,*thedpsfit; extern psfitstruct *thepsfit,*thedpsfit;
PIXTYPE *checkmask; extern PIXTYPE *checkmask;
/*-------------------------------- functions --------------------------------*/ /*-------------------------------- functions --------------------------------*/
extern void compute_pos(int *pnpsf,int *pconvflag,int *pnpsfflag, extern void compute_pos(int *pnpsf,int *pconvflag,int *pnpsfflag,
......
src/retina.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1995-2010 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1995-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include "image.h" #include "image.h"
#include "retina.h" #include "retina.h"
/******************************** readretina *********************************/ /******************************** readretina *********************************/
/* /*
Return the response of the retina at a given image position. Return the response of the retina at a given image position.
......
src/retina.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1995-2010 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1995-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -38,8 +38,6 @@ typedef struct structreti ...@@ -38,8 +38,6 @@ typedef struct structreti
struct structbpann *bpann; /* The neural network */ struct structbpann *bpann; /* The neural network */
} retistruct; } retistruct;
retistruct *theretina;
/*------------------------------- functions ---------------------------------*/ /*------------------------------- functions ---------------------------------*/
retistruct *getretina(char *filename); retistruct *getretina(char *filename);
......
src/sexhead1.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1996-2011 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1996-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 22/08/2011 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
int idummy; extern int idummy;
double ddummy; extern double ddummy;
keystruct headkey1[] = { keystruct headkey1[] = {
{"EPOCH ", "", {"EPOCH ", "",
......
src/som.c
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1995-2010 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1995-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#include "prefs.h" #include "prefs.h"
#include "som.h" #include "som.h"
somstruct *thesom;
/********************************* som_phot **********************************/ /********************************* som_phot **********************************/
/* /*
Perform SOM-fitting on a detected source: returns node number of the Perform SOM-fitting on a detected source: returns node number of the
......
src/som.h
View file @ a3ce8c8a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1995-2010 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1995-2020 IAP/CNRS/SorbonneU
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 15/07/2020
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -70,7 +70,7 @@ typedef struct ...@@ -70,7 +70,7 @@ typedef struct
float stderror; /* Global reduced error */ float stderror; /* Global reduced error */
} somstruct; } somstruct;
somstruct *thesom; extern somstruct *thesom;
/*---------------------------------- protos --------------------------------*/ /*---------------------------------- protos --------------------------------*/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment