Mercurial > mplayer.hg

comparison vidix/sysdep/pci_linux.c @ 31466:765facb4279f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless __linux__ preprocessor checks. The file is only ever used if that preprocessor check is true.
author diego
date Wed, 23 Jun 2010 11:36:40 +0000
parents a6268840b870
children 98e1af7a4077
comparison
equal deleted inserted replaced
31465:65a4a8ddb552 31466:765facb4279f
108 return 0; 108 return 0;
109 } 109 }
110 dhahelper_initialized = -1; 110 dhahelper_initialized = -1;
111 #endif 111 #endif
112 112
113 #if defined(__powerpc__) && defined(__linux__) 113 #ifdef __powerpc__
114 /* should be fixed? */ 114 /* should be fixed? */
115 #else 115 #else
116 if (iopl(3) != 0) 116 if (iopl(3) != 0)
117 return errno; 117 return errno;
118 #endif 118 #endif
129 #ifdef CONFIG_DHAHELPER 129 #ifdef CONFIG_DHAHELPER
130 if (dhahelper_initialized == 1) 130 if (dhahelper_initialized == 1)
131 close(dhahelper_fd); 131 close(dhahelper_fd);
132 else 132 else
133 #endif 133 #endif
134 #if defined(__powerpc__) && defined(__linux__) 134 #ifdef __powerpc__
135 /* should be fixed? */ 135 /* should be fixed? */
136 #else 136 #else
137 if (iopl(0) != 0) 137 if (iopl(0) != 0)
138 return errno; 138 return errno;
139 #endif 139 #endif
140 return 0; 140 return 0;
141 } 141 }
142 142
143 #if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \ 143 #if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \
144 || defined(__x86_64__) || defined(__sh__)) && defined(__linux__) && !defined(CONFIG_SVGAHELPER) 144 || defined(__x86_64__) || defined(__sh__)) && !defined(CONFIG_SVGAHELPER)
145 #define CONFIG_PCI_LINUX_PROC 145 #define CONFIG_PCI_LINUX_PROC
146 #endif 146 #endif
147 147
148 #if defined(CONFIG_PCI_LINUX_PROC) 148 #if defined(CONFIG_PCI_LINUX_PROC)
149 static int pci_config_type( void ) { return 1; } 149 static int pci_config_type( void ) { return 1; }