Move GCC attribute declarations from pref.h.orig to new file

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

diff --git a/pref.h.orig b/pref.h.orig
index be0451150bbeb807985961a0dbd4f03de1c251ea..f2efb834c970a5a2c376176f1b9ed30b8c2d2fc9 100644 (file)
--- a/pref.h.orig
+++ b/pref.h.orig
@@ -1,8 +1,5 @@
 /* -*- C -*- */
 
-/* Used by separable libraries to enable PSPP-specific features. */
-#define PSPP 1
-
 /*
  *
  * Debugging
@@ -19,80 +16,20 @@
 #if !HAVE_LIBPLOT
 #define NO_CHARTS 1
 #endif
-
-/* Define these if DEBUGGING is off and you want to make certain
-   additional optimizations. */
-#if !DEBUGGING
-/* #define NDEBUG 1 */                 /* disable assert() sanity checks */
-#endif
-\f
-/* Compilers. */
-
-/* Use proper keywords. */
-#if __GNUC__ > 1 && !defined (inline)
-#define inline __inline__
-#endif
-
-/* GNU C allows the programmer to declare that certain functions take
-   printf-like arguments, never return, etc.  Conditionalize these
-   declarations on whether gcc is in use. */
-#if __GNUC__ > 1
-#define ATTRIBUTE(X) __attribute__ (X)
-#else
-#define ATTRIBUTE(X)
-#endif
-
-#define UNUSED ATTRIBUTE ((unused))
-#define NO_RETURN ATTRIBUTE ((noreturn))
-#define PRINTF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (printf, FMT, FIRST)))
-#define SCANF_FORMAT(FMT, FIRST) ATTRIBUTE ((format (scanf, FMT, FIRST)))
-
-/* This attribute was added late in the GCC 2.x cycle. */
-#if __GNUC__ > 2
-#define MALLOC_LIKE ATTRIBUTE ((malloc))
-#else
-#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
 #define P_tmpdir "/tmp"
 #endif
+
+#define SHORT_NAME_LEN 8
+#define LONG_NAME_LEN 64