← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to os/osinit.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
os/osinit.c
94
94
 
95
95
Bool OsDelayInitColors = FALSE;
96
96
 
97
 
#ifdef XFree86LOADER
98
 
extern void xf86WrapperInit(void);
99
 
#endif
100
 
 
101
97
void
102
98
OsInit(void)
103
99
{
111
107
#endif
112
108
 
113
109
    if (!been_here) {
114
 
#ifdef XFree86LOADER
115
 
        xf86WrapperInit();
116
 
#endif
117
110
#if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__)
118
111
        fclose(stdin);
119
112
        fclose(stdout);