Yet another tweak from J�rgen.

[lyx.git] / src / os2_defines.h

diff --git a/src/os2_defines.h b/src/os2_defines.h
index 02525f954658e0bc2c06aee58549f95b6ab1b4ad..aa2b0c785500348f334632bc75d9c302cc46a941 100644 (file)
--- a/src/os2_defines.h
+++ b/src/os2_defines.h
@@ -1,30 +1,38 @@
 /* -*- C++ -*- */
 /* This file is part of
-* ======================================================
+* ====================================================== 
 * 
 *           LyX, The Document Processor
 *        
-*           Copyright (C) 1995,1996 Matthias Ettrich
+*           Copyright 1995 Matthias Ettrich
+*           Copyright 1995-2001 The LyX Team.
 *
-*======================================================
+* ====================================================== 
  A few prototypes and definitions needed for OS/2 */
 
-#ifndef _OS2_DEFINES_H
-#define _OS2_DEFINES_H
+#ifndef OS2_DEFINES_H
+#define OS2_DEFINES_H
 
+#if defined (__cplusplus)
+#include <cctype>
+#include <cstdlib>
+
+extern "C"
+inline int readlink(const char *, char *, size_t) {return -1;}
+
+#else
 #include <ctype.h>
-#include <process.h>
 #include <stdlib.h>
+#define readlink(s, t, l) (-1)
+#endif
+#include <process.h>
 #include <unistd.h>
 #include <X11/Xlocale.h>
-/* #include <assert.h> */
 /* #include <malloc.h> */
 #define lstat stat
 #define S_ISLNK(x) false
 #define S_ISBLK(x) false
-#define readlink(s,t,l) (strcpy(t,s),strlen(t))
-/*#define mkfifo(p,m) (0) *//* LyXserver is temporary disabled. */
-#define getcwd _getcwd2
+/*#define mkfifo(p, m) (0) *//* LyXserver is temporary disabled. */
 #define chdir _chdir2
 #define strcasecmp stricmp
 #if defined (__cplusplus)