Document that the character_code field can be a Windows code page

[pspp-builds.git] / src / data / sfm-private.h

diff --git a/src/data/sfm-private.h b/src/data/sfm-private.h
index c127b85e71c5b366123e564df1fdb9c3cc74043b..96d0894890a0b791c1de30fa38b16737e12f6a9e 100644 (file)
--- a/src/data/sfm-private.h
+++ b/src/data/sfm-private.h
@@ -20,24 +20,15 @@
 /* PORTME: There might easily be alignment problems with some of these
    structures. */
 
-/* This attribute might avoid some problems.  On the other hand... */
-#define P ATTRIBUTE ((packed))
+#include <libpspp/compiler.h>
+#include <stdint.h>
+#include "variable.h"
+
 
 #if __BORLANDC__
 #pragma option -a-             /* Turn off alignment. */
 #endif
 
-/* Find 32-bit signed integer type. */
-#if SIZEOF_SHORT == 4
-  #define int32 short
-#elif SIZEOF_INT == 4
-  #define int32 int
-#elif SIZEOF_LONG == 4
-  #define int32 long
-#else
-  #error Which one of your basic types is 32-bit signed integer?
-#endif
-
 /* Find 64-bit floating-point type. */
 #if SIZEOF_FLOAT == 8
   #define flt64 float
@@ -50,12 +41,10 @@
   #define FLT64_MAX LDBL_MAX
 #else
   #error Which one of your basic types is 64-bit floating point?
-  #define flt64 double
-  #define FLT64_MAX DBL_MAX
 #endif
 
 /* Figure out SYSMIS value for flt64. */
-#include "magic.h"
+#include <libpspp/magic.h>
 #if SIZEOF_DOUBLE == 8
 #define second_lowest_flt64 second_lowest_value
 #else
@@ -65,34 +54,34 @@
 /* Record Type 1: General Information. */
 struct sysfile_header
   {
-    char rec_type[4] P;                /* 00: Record-type code, "$FL2". */
-    char prod_name[60] P;      /* 04: Product identification. */
-    int32 layout_code P;       /* 40: 2. */
-    int32 case_size P;         /* 44: Number of `value's per case. 
+    char rec_type[4] ;         /* 00: Record-type code, "$FL2". */
+    char prod_name[60] ;       /* 04: Product identification. */
+    int32_t layout_code ;      /* 40: 2. */
+    int32_t nominal_case_size ;        /* 44: Number of `value's per case. 
                                   Note: some systems set this to -1 */
-    int32 compress P;          /* 48: 1=compressed, 0=not compressed. */
-    int32 weight_idx P;         /* 4c: 1-based index of weighting var, or 0. */
-    int32 case_cnt P;          /* 50: Number of cases, -1 if unknown. */
-    flt64 bias P;              /* 54: Compression bias (100.0). */
-    char creation_date[9] P;   /* 5c: `dd mmm yy' creation date of file. */
-    char creation_time[8] P;   /* 65: `hh:mm:ss' 24-hour creation time. */
-    char file_label[64] P;     /* 6d: File label. */
-    char padding[3] P;         /* ad: Ignored padding. */
-  };
+    int32_t compress ;         /* 48: 1=compressed, 0=not compressed. */
+    int32_t weight_idx ;         /* 4c: 1-based index of weighting var, or 0. */
+    int32_t case_cnt ;         /* 50: Number of cases, -1 if unknown. */
+    flt64 bias ;               /* 54: Compression bias (100.0). */
+    char creation_date[9] ;    /* 5c: `dd mmm yy' creation date of file. */
+    char creation_time[8] ;    /* 65: `hh:mm:ss' 24-hour creation time. */
+    char file_label[64] ;      /* 6d: File label. */
+    char padding[3] ;          /* ad: Ignored padding. */
+  } ATTRIBUTE((packed)) ;
 
 /* Record Type 2: Variable. */
 struct sysfile_variable
   {
-    int32 rec_type P;          /* 2. */
-    int32 type P;              /* 0=numeric, 1-255=string width,
+    int32_t rec_type ;         /* 2. */
+    int32_t type ;             /* 0=numeric, 1-255=string width,
                                   -1=continued string. */
-    int32 has_var_label P;     /* 1=has a variable label, 0=doesn't. */
-    int32 n_missing_values P;  /* Missing value code of -3,-2,0,1,2, or 3. */
-    int32 print P;     /* Print format. */
-    int32 write P;     /* Write format. */
-    char name[SHORT_NAME_LEN] P; /* Variable name. */
+    int32_t has_var_label ;    /* 1=has a variable label, 0=doesn't. */
+    int32_t n_missing_values ; /* Missing value code of -3,-2,0,1,2, or 3. */
+    int32_t print ;            /* Print format. */
+    int32_t write ;            /* Write format. */
+    char name[SHORT_NAME_LEN] ; /* Variable name. */
     /* The rest of the structure varies. */
-  };
+  } ATTRIBUTE((packed)) ;
 
 #if __BORLANDC__
 #pragma -a4