diff options
| author | Matt Dew <marcoz@osource.org> | 2013-11-16 15:27:35 -0700 |
|---|---|---|
| committer | Matt Dew <marcoz@osource.org> | 2013-11-16 15:27:35 -0700 |
| commit | 384588bd8408d50b1b29b174af75c7b1cd3ff60d (patch) | |
| tree | a94e49c1d33e08da972b667afb487bfce1f02107 | |
| parent | 6cc5efa68e5fdc301ab9a381bffe88fe5c7865e2 (diff) | |
| parent | 7ddc6f7f1ed0e0f85b2d617c59d75d5de1cd2d5a (diff) | |
Merge commit '7ddc6f7f1ed0e0f85b2d617c59d75d5de1cd2d5a' into server-1.14-branch
| -rw-r--r-- | hw/xfree86/common/xf86Bus.c | 5 | ||||
| -rw-r--r-- | hw/xquartz/X11Controller.m | 2 | ||||
| -rw-r--r-- | hw/xquartz/bundle/Info.plist.cpp | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 329d0b3d5..d463e9196 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -266,9 +266,12 @@ xf86IsEntityPrimary(int entityIndex) { EntityPtr pEnt = xf86Entities[entityIndex]; +#ifdef XSERVER_LIBPCIACCESS if (primaryBus.type == BUS_PLATFORM && pEnt->bus.type == BUS_PCI) return MATCH_PCI_DEVICES(pEnt->bus.id.pci, primaryBus.id.plat->pdev); - else if (primaryBus.type != pEnt->bus.type) +#endif + + if (primaryBus.type != pEnt->bus.type) return FALSE; switch (pEnt->bus.type) { diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index 737db42e7..3d094bfc7 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -936,7 +936,7 @@ extern char *bundle_id_prefix; - (void) applicationWillTerminate:(NSNotification *)aNotification { - unsigned remain; + int remain; [X11App prefs_synchronize]; /* shutdown the X server, it will exit () for us. */ diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp index 905952a68..4b4a894a4 100644 --- a/hw/xquartz/bundle/Info.plist.cpp +++ b/hw/xquartz/bundle/Info.plist.cpp @@ -39,9 +39,9 @@ <key>LSApplicationCategoryType</key> <string>public.app-category.utilities</string> <key>NSHumanReadableCopyright</key> - <string>© 2003-2012 Apple Inc. + <string>© 2003-2013 Apple Inc. © 2003 XFree86 Project, Inc. -© 2003-2012 X.org Foundation, Inc. +© 2003-2013 X.org Foundation, Inc. </string> <key>NSMainNibFile</key> <string>main</string> |