Commit f0910fe4 authored by Cristina Valeria Torres's avatar Cristina Valeria Torres
Browse files

Merge branch 'master' of git+ssh://cristina.torres@ligo-vcs.phys.uwm.edu/usr/local/git/lalsuite

Original: 1636d54f3e410a1564cef5a5f1cb432b0deb018e
parents 1dba0d6c f9cf83cb
......@@ -8,7 +8,7 @@ fail () {
}
## build sources, where appropriate
for d in lal lalframe; do
for d in lal; do
echo "00boot: building sources in $d"
(cd "$d" && ./00boot --only-build-sources 1>/dev/null) || fail "00boot in $d"
done
......
## This file gets automatically appended to the end of the Makefile
include-link:
@for file in $(HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=`cd $(srcdir) && pwd`; \
targetdir=`cd $(top_builddir)/include/lal && pwd`; \
if test ! -r $$targetdir/$$file ; then \
......
......@@ -43,9 +43,10 @@
#include <lal/LALDatatypes.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
#ifdef __cplusplus
......@@ -499,8 +500,9 @@ LALCOMPLEX16VectorFFT (
#undef RESTRICT
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -44,9 +44,10 @@
#include <lal/LALDatatypes.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
#ifdef __cplusplus
......@@ -907,8 +908,9 @@ LALREAL8VectorFFT(
#undef RESTRICT
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -66,9 +66,10 @@
#include <lal/RealFFT.h>
#include <lal/Window.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID( TIMEFREQFFTH, "$Id$" );
......@@ -460,8 +461,9 @@ XLALPSDRegressorSetPSD(
unsigned weight
);
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -101,9 +101,10 @@ signiatures of the digitization.
#include <lal/LALStdlib.h>
#include <lal/Random.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID( INJECTH, "$Id$" );
......@@ -158,8 +159,9 @@ LALSSInjectTimeSeries( LALStatus *,
REAL4TimeSeries *output,
REAL4TimeSeries *signalvec );
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -26,9 +26,10 @@
#include <lal/LALRCSID.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID(LALSIMULATIONH, "$Id:");
......@@ -55,8 +56,9 @@ int XLALSimAddInjectionREAL8TimeSeries(
const COMPLEX16FrequencySeries *response
);
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -258,9 +258,10 @@ f/\dot{f}$ (provided $\tau\gg1/f$, as we have assumed).
#include <lal/SkyCoordinates.h>
#include <lal/LALBarycenter.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID( SIMULATECOHERENTGWH, "$Id$" );
......@@ -410,8 +411,9 @@ LALSimulateCoherentGW( LALStatus *status,
%\newpage\input{SimulateCoherentGWTestC}
</lalLaTeX> */
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -69,9 +69,10 @@ fully LAL-compliant and use only LAL types, so they are included in
#include <lal/LALStdlib.h>
#include <lal/LALStdio.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID( STRINGINPUTH, "$Id$");
......@@ -243,8 +244,9 @@ LALStringToZ( LALStatus *status, COMPLEX16 *value, const CHAR *string, CHAR **en
void
LALStringToGPS( LALStatus *status, LIGOTimeGPS *value, const CHAR *string, CHAR **endptr );
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -117,9 +117,10 @@
NRCSID( XLALERRORH, "$Id$" );
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
......@@ -458,8 +459,9 @@ void XLALError(
#define XLAL_ERROR_REAL8( func, errnum ) \
XLAL_ERROR_VAL( func, errnum, XLAL_REAL8_FAIL_NAN )
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -39,9 +39,10 @@
NRCSID( AUDIOH, "$Id$" );
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
/** Records a time series as a .wav audio file */
......@@ -56,8 +57,9 @@ int XLALAudioAURecordREAL4TimeSeries( FILE *fp, REAL4TimeSeries *series );
/** Records a time series as a .au audio file */
int XLALAudioAURecordREAL8TimeSeries( FILE *fp, REAL8TimeSeries *series );
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -63,9 +63,9 @@ typedef struct tagLALFILE { int compression; void *fp; } LALFILE;
LALFILE *lalstdin(void);
LALFILE *lalstdout(void);
LALFILE *lalstderr(void);
#define lalstdin (lalstdin())
#define lalstdout (lalstdout())
#define lalstderr (lalstderr())
#define LALSTDIN (lalstdin())
#define LALSTDOUT (lalstdout())
#define LALSTDERR (lalstderr())
int XLALFileIsCompressed( const char *path );
LALFILE * XLALFileOpenRead( const char *path );
......
......@@ -154,9 +154,10 @@
#include <stdlib.h>
#include <lal/LALStdlib.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
......@@ -222,8 +223,9 @@ LALMathNDPlot( LALStatus *status,
INT4 *ntiles,
REAL4 *pointSize );
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -28,8 +28,7 @@
*-----------------------------------------------------------------------
*/
#if 0
<lalVerbatim file="ReadNoiseSpectrumHV">
/* <lalVerbatim file="ReadNoiseSpectrumHV">
Author: Brady, P. R.
$Id$
</lalVerbatim>
......@@ -46,8 +45,7 @@ a frequency series.
#include <lal/ReadNoiseSpectrum.h>
\end{verbatim}
</lalLaTeX>
#endif
</lalLaTeX> */
#ifndef _READNOISESPECTRUMH_H
#define _READNOISESPECTRUMH_H
......@@ -55,9 +53,10 @@ a frequency series.
#include <lal/LALDatatypes.h>
#include <lal/Date.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
......@@ -90,15 +89,14 @@ void LALReadNoiseSpectrum(
CHAR *fname
);
#if 0
<lalLaTeX>
/* <lalLaTeX>
\vfill{\footnotesize\input{ReadNoiseSpectrumHV}}
\newpage\input{ReadNoiseSpectrumC}
</lalLaTeX> */
#endif
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -116,15 +116,6 @@ extern void gzclearerr (gzFile file);
#include <lal/LALStdio.h>
#include <lal/FileIO.h>
#ifdef lalstdin
#undef lalstdin
#endif
#ifdef lalstdout
#undef lalstdout
#endif
#ifdef lalstderr
#undef lalstderr
#endif
LALFILE * lalstdin( void )
{
static LALFILE _lalstdin;
......
......@@ -47,9 +47,10 @@ Further documentation is given in the individual routines' modules.
#include <lal/IIRFilter.h>
#include <lal/ZPGFilter.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID(BANDPASSTIMESERIESH,"$Id$");
......@@ -146,8 +147,9 @@ LALDButterworthREAL4TimeSeries( LALStatus *status,
\newpage\input{BandPassTestC}
</lalLaTeX> */
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -109,9 +109,10 @@ routines never actually use this coefficient.
#include <lal/LALStdlib.h>
#include <lal/ZPGFilter.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID(IIRFILTERH,"$Id$");
......@@ -281,8 +282,9 @@ LALDIIRFilterREAL4VectorR( LALStatus *status,
\newpage\input{IIRFilterTestC}
</lalLaTeX> */
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -81,9 +81,10 @@ variable is assumed.
#include <lal/LALStdlib.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID(ZPGFILTERH,"$Id$");
......@@ -157,8 +158,9 @@ void
LALWToZCOMPLEX16ZPGFilter( LALStatus *status,
COMPLEX16ZPGFilter *filter );
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -41,9 +41,10 @@
NRCSID (CALIBRATIONH,"$Id$");
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma } /** to match the previous brace **/
#elif 0
} /* so that editors will match preceding brace */
#endif
/**** <lalLaTeX>
......@@ -363,8 +364,9 @@ int XLALUpsample(REAL8TimeSeries *uphR, REAL8TimeSeries *hR, int up_factor);
int XLALUpsampleLinear(REAL8TimeSeries *uphR, REAL8TimeSeries *hR, int up_factor);
#ifdef __cplusplus
#pragma { /** to match the next brace **/
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
......@@ -30,9 +30,10 @@ $Id$
#include <lal/SkyCoordinates.h>
#include <lal/IIRFilter.h>
#ifdef __cplusplus
#if defined(__cplusplus)
extern "C" {
#pragma }
#elif 0
} /* so that editors will match preceding brace */
#endif
NRCSID( COHERENTESTIMATION, "$Id$" );
......@@ -104,8 +105,9 @@ LALClearCoherentInfo (
CoherentEstimation *dat
);
#ifdef __cplusplus
#pragma {
#if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
}
#endif
......
Markdown is supported
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