source: trunk/poppler/mypoppler/goo/diff @ 257

Last change on this file since 257 was 2, checked in by Eugene Romanenko, 16 years ago

First import

File size: 3.7 KB
Line 
1diff -EbBc ./gfile.cc D:\Projects\poppler\mypoppler\goo/gfile.cc
2*** ./gfile.cc  Mon Apr  4 23:02:06 2005
3--- D:\Projects\poppler\mypoppler\goo/gfile.cc  Tue Jan 31 18:18:36 2006
4***************
5*** 20,26 ****
6  #  endif
7  #  include <limits.h>
8  #  include <string.h>
9! #  if !defined(VMS) && !defined(ACORN) && !defined(MACOS)
10  #    include <pwd.h>
11  #  endif
12  #  if defined(VMS) && (__DECCXX_VER < 50200000)
13--- 20,26 ----
14  #  endif
15  #  include <limits.h>
16  #  include <string.h>
17! #  if !defined(VMS) && !defined(ACORN) && !defined(MACOS) && !defined(OS2)
18  #    include <pwd.h>
19  #  endif
20  #  if defined(VMS) && (__DECCXX_VER < 50200000)
21***************
22*** 43,49 ****
23    //---------- VMS ----------
24    return new GooString("SYS$LOGIN:");
25 
26! #elif defined(__EMX__) || defined(WIN32)
27    //---------- OS/2+EMX and Win32 ----------
28    char *s;
29    GooString *ret;
30--- 43,49 ----
31    //---------- VMS ----------
32    return new GooString("SYS$LOGIN:");
33 
34! #elif defined(__EMX__) || defined(WIN32) || defined(OS2)
35    //---------- OS/2+EMX and Win32 ----------
36    char *s;
37    GooString *ret;
38***************
39*** 192,198 ****
40    }
41    return path;
42 
43! #elif defined(__EMX__)
44    //---------- OS/2+EMX ----------
45    int i;
46 
47--- 192,198 ----
48    }
49    return path;
50 
51! #elif defined(__EMX__) || defined(OS2)
52    //---------- OS/2+EMX ----------
53    int i;
54 
55***************
56*** 279,285 ****
57      return new GooString(fileName, p + 1 - fileName);
58    return new GooString();
59 
60! #elif defined(__EMX__) || defined(WIN32)
61    //---------- OS/2+EMX and Win32 ----------
62    char *p;
63 
64--- 279,285 ----
65      return new GooString(fileName, p + 1 - fileName);
66    return new GooString();
67 
68! #elif defined(__EMX__) || defined(WIN32) || defined(OS2)
69    //---------- OS/2+EMX and Win32 ----------
70    char *p;
71 
72***************
73*** 323,329 ****
74    return strchr(path, ':') ||
75         (path[0] == '[' && path[1] != '.' && path[1] != '-');
76 
77! #elif defined(__EMX__) || defined(WIN32)
78    //---------- OS/2+EMX and Win32 ----------
79    return path[0] == '/' || path[0] == '\\' || path[1] == ':';
80 
81--- 323,329 ----
82    return strchr(path, ':') ||
83         (path[0] == '[' && path[1] != '.' && path[1] != '-');
84 
85! #elif defined(__EMX__) || defined(WIN32) || defined(OS2)
86    //---------- OS/2+EMX and Win32 ----------
87    return path[0] == '/' || path[0] == '\\' || path[1] == ':';
88 
89***************
90*** 377,382 ****
91--- 377,394 ----
92    path->del(0, 1);
93    return path;
94 
95+ #elif defined(OS2)
96+   //---------- OS/2 -----------
97+   char buf[_MAX_PATH];
98+   buf[0] = '\0';
99+   if (!_fullpath( buf, path->getCString(), _MAX_PATH ) ) {
100+     path->clear();
101+     return path;
102+   }
103+   path->clear();
104+   path->append(buf);
105+   return path;
106+   
107  #else
108    //---------- Unix and OS/2+EMX ----------
109    struct passwd *pw;
110***************
111*** 455,461 ****
112      return gFalse;
113    }
114    return gTrue;
115! #elif defined(VMS) || defined(__EMX__) || defined(ACORN) || defined(MACOS)
116    //---------- non-Unix ----------
117    char *s;
118 
119--- 467,473 ----
120      return gFalse;
121    }
122    return gTrue;
123! #elif defined(VMS) || defined(__EMX__) || defined(ACORN) || defined(MACOS) || defined(OS2)
124    //---------- non-Unix ----------
125    char *s;
126 
127diff -EbBc ./gfile.h D:\Projects\poppler\mypoppler\goo/gfile.h
128*** ./gfile.h   Thu Mar  3 21:45:58 2005
129--- D:\Projects\poppler\mypoppler\goo/gfile.h   Mon Jan 30 19:19:46 2006
130***************
131*** 45,50 ****
132--- 45,53 ----
133  #    if HAVE_NDIR_H
134  #      include <ndir.h>
135  #    endif
136+ #    if HAVE_DIRECT_H
137+ #      include <direct.h>
138+ #    endif
139  #  endif
140  #endif
141  }
Note: See TracBrowser for help on using the repository browser.