Checkin of new directory structure.

[pspp-builds.git] / pref.h.orig

diff --git a/pref.h.orig b/pref.h.orig
index 2193c6b4082b1fcbf340b8161fd0e5be07d02ae2..e67f4cf859279e26359fb51db97aca6b8b8b9c88 100644 (file)
--- a/pref.h.orig
+++ b/pref.h.orig
@@ -38,6 +38,9 @@
    declarations on whether gcc is in use. */
 #if __GNUC__ > 1
 #define ATTRIBUTE(X) __attribute__ (X)
+
+/* Only necessary because of a wart in gnulib's xalloc.h. */
+#define __attribute__(X) __attribute__ (X)
 #else
 #define ATTRIBUTE(X)
 #endif
@@ -54,43 +57,14 @@
 #define MALLOC_LIKE
 #endif
 \f
-/* Internationalization. */
-#include <libintl.h>
-
-#if !ENABLE_NLS
-/* If we don't do this then gettext() still monkeys with the
-   string, keeping gcc from checking printf() format types. */
-#undef gettext
-#define gettext(STRING) STRING
-#endif
-
-#define _(STRING) gettext(STRING)
-#define N_(STRING) STRING
-\f
 /* Filesystems. */
 
-/* Directory separator and path delimiter for this OS. */
-#ifndef __MSDOS__
-#define DIR_SEPARATOR '/'
-#define PATH_DELIMITER ':'
-#else
-#define DIR_SEPARATOR '\\'
-#define PATH_DELIMITER ';'
-#endif
-\f
 /* Options. */
 
 /* Approximate amount of memory, in bytes, to allocate before paging
    to disk.  */
 #define MAX_WORKSPACE (4*1024*1024)    /* 4 MBytes */
 
-/* (libhistory) The location for the history file that records
-   commands entered interactively.  Tilde expansion is performed. */
-#define HISTORY_FILE "~/.pspp_history"
-
-/* (libhistory) Maximum number of commands to record in history
-   file. */
-#define MAX_HISTORY 500
 \f
 /* Non ansi compilers may set this */
 #ifndef P_tmpdir