X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fval.h;h=927bd916c8df25995cb18c2267b5dee235c0a0bf;hb=6d2a8977cc6a54e9e2278467f2af3d5ae277cd43;hp=fc098fda975af76ed6559255f371961ab212a1d1;hpb=0a2cdacebb16d9a13c1b382c5ffa29e32cf858ea;p=pspp

diff --git a/src/val.h b/src/val.h
index fc098fda97..927bd916c8 100644
--- a/src/val.h
+++ b/src/val.h
@@ -14,14 +14,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #if !val_h
 #define val_h 1
 
 #include <float.h>
 
+#include <config.h>
+
 /* Values. */
 
 /* Max length of a short string value, generally 8 chars. */
@@ -35,8 +37,8 @@
    then short string missing values can be truncated in system files
    because there's only room for as many characters as can fit in a
    flt64. */
-#if MAX_SHORT_STRING > 8
-#error MAX_SHORT_STRING must be less than 8.
+#if MAX_SHORT_STRING > SHORT_NAME_LEN
+#error MAX_SHORT_STRING must be less than or equal to SHORT_NAME_LEN.
 #endif
 
 /* Special values. */
@@ -52,7 +54,7 @@ union value
     double f;
 
     /* A short-string value. */
-    unsigned char s[MAX_SHORT_STRING];
+    char s[MAX_SHORT_STRING];
 
     /* Used by evaluate_expression() to return a string result.
        As currently implemented, it's a pointer to a dynamic
@@ -60,7 +62,7 @@ union value
 
        Also used by the AGGREGATE procedure in handling string
        values. */
-    unsigned char *c;
+    char *c;
   };
 
 /* Maximum number of `union value's in a single number or string
@@ -72,4 +74,5 @@ int compare_values (const union value *a, const union value *b, int width);
 unsigned  hash_value(const union value  *v, int width);
 
 
+
 #endif /* !val_h */