Changeset 15399 for branches/eam_branch_20071023/psModules/src/config/pmConfig.h

Timestamp:

Oct 28, 2007, 3:40:54 PM (19 years ago)

Author:

eugene

Message:

merging diffs from cvs head

File:

• branches/eam_branch_20071023/psModules/src/config/pmConfig.h (modified) (3 diffs)

branches/eam_branch_20071023/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-04 20:15:48 $
+ *  @version $Revision: 1.31.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-29 01:40:54 $
+ *
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -36 +37 @@
 /// This structure stores the configuration information: the site, camera and recipe configuration, the
 /// command-line arguments, the pmFPAfiles used, and the database handle.
-typedef struct
-{
+typedef struct {
     psMetadata *site;                   ///< Site configuration
     psMetadata *camera;                 ///< Camera specification
@@ -51 +51 @@
     pmRecipeSource recipesRead;         ///< Which recipe sources have been read
     psMetadata *recipeSymbols;          ///< Where each recipe came from
-
-    // dropping the argc, argv info from pmConfig
-    # if (0)
-    int *argc;                          ///< Number of command-line arguments
-    char **argv;                        ///< Command-line arguments (raw version)
-    # endif
-}
-pmConfig;
+    int traceFD;                        ///< File descriptor for trace messages
+    int logFD;                          ///< File descriptor for log messages
+} pmConfig;
 
 /// Allocator for pmConfig