Changeset 2552 in Sophya for trunk/SophyaExt/XAstroPack

Timestamp:

Jun 15, 2004, 6:54:57 PM (21 years ago)

Author:

cmv

Message:

POUR LA nouvelle version de xephem/libastro (3.6) cmv 15/6/04

Location:

trunk/SophyaExt/XAstroPack

Files:

• Makefile (modified) (1 diff)
• xastropack.cc (modified) (1 diff)
• xastropack.h (modified) (3 diffs)

trunk/SophyaExt/XAstroPack/Makefile

@@ -14 +14 @@
 $(OBJ)xastropack.o: xastropack.cc xastropack.h \
  $(INC)machdefs.h \
- $(EXTINCPATH)XAstro/P_.h \
  $(EXTINCPATH)XAstro/astro.h
 $(OBJ)magfield.o: magfield.c magfield.h

trunk/SophyaExt/XAstroPack/xastropack.cc

@@ -819 +819 @@
  \endverbatim
 */
-void PlanetPos(double mjd,int numplan,double *sunecl,double *sunecb,double *sundist
+void PlanetPos(double mjd,PLCode numplan,double *sunecl,double *sunecb,double *sundist
               ,double *geodist,double *geoecl,double *geoecb
               ,double *diamang,double *mag)

trunk/SophyaExt/XAstroPack/xastropack.h

@@ -9 +9 @@
 extern "C" {  /* extern "C" */
 #endif
-#include "XAstro/P_.h"
+/* #include "XAstro/P_.h" */
 #include "XAstro/astro.h"
+#undef mjd
+#undef lat
+#undef lng
+#undef tz
+#undef temp
+#undef pressure
+#undef elev
+#undef dip
+#undef epoch
+#undef tznm
+#undef mjed
 #ifdef __cplusplus
 }             /* extern "C" */
@@ -177 +188 @@
 void SunPos(double mjd,double *eclsn,double *ecbsn,double *rsn);
 void MoonPos(double mjd,double *lmn,double *bmn,double *rho);
-void PlanetPos(double mjd,int numplan,double *sunecl,double *sunecb,double *sundist
+void PlanetPos(double mjd,PLCode numplan,double *sunecl,double *sunecb,double *sundist
                ,double *geodist,double *geoecl,double *geoecb
                ,double *diamang,double *mag);
@@ -183 +194 @@
 \brief Same as PlanetPos above with less arguments
 */
-inline void PlanetPos(double mjd,int numplan,double *geoecl,double *geoecb
+inline void PlanetPos(double mjd,PLCode numplan,double *geoecl,double *geoecb
                       ,double *geodist,double *diamang)
 {