← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/loader/FTPDirectoryDocument.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/loader/FTPDirectoryDocument.cpp
43
43
#if PLATFORM(QT)
44
44
#include <QDateTime>
45
45
// On Windows, use the threadsafe *_r functions provided by pthread.
46
 
#elif PLATFORM(WIN_OS) && (USE(PTHREADS) || HAVE(PTHREAD_H))
 
46
#elif OS(WINDOWS) && (USE(PTHREADS) || HAVE(PTHREAD_H))
47
47
#include <pthread.h>
48
48
#endif
49
49
 
234
234
}
235
235
 
236
236
#define localtime_r(x, y) localTimeQt(x, y)
237
 
#elif PLATFORM(WIN_OS) && !defined(localtime_r)
 
237
#elif OS(WINDOWS) && !defined(localtime_r)
238
238
#if defined(_MSC_VER) && (_MSC_VER >= 1400) 
239
239
#define localtime_r(x, y) localtime_s((y), (x))
240
240
#else /* !_MSC_VER */