Bug #191 rename header guard to not use reserved macro name.

This commit is contained in:
Dave Davenport 2015-07-27 09:22:21 +02:00
parent 99016c5640
commit 8104997e6f
8 changed files with 20 additions and 20 deletions

View File

@ -1,5 +1,5 @@
#ifndef __HELPER_H__ #ifndef HELPER_H
#define __HELPER_H__ #define HELPER_H
#include "rofi.h" #include "rofi.h"
/** /**
* @param string The input string. * @param string The input string.
@ -149,4 +149,4 @@ char helper_parse_char ( const char *arg );
* Set the application arguments. * Set the application arguments.
*/ */
void cmd_set_arguments ( int argc, char **argv ); void cmd_set_arguments ( int argc, char **argv );
#endif // __HELPER_H__ #endif // HELPER_H

View File

@ -24,8 +24,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#ifndef __HISTORY_H__ #ifndef HISTORY_H
#define __HISTORY_H__ #define HISTORY_H
/** /**
* @param filename The filename of the history cache. * @param filename The filename of the history cache.

View File

@ -1,5 +1,5 @@
#ifndef __ROFI_I3_H__ #ifndef ROFI_I3_H
#define __ROFI_I3_H__ #define ROFI_I3_H
/** /**
* These functions are dummies when i3 support is not compiled in. * These functions are dummies when i3 support is not compiled in.
@ -29,4 +29,4 @@ int i3_support_initialize ( Display *display );
* Cleanup. * Cleanup.
*/ */
void i3_support_free_internals ( void ); void i3_support_free_internals ( void );
#endif // __ROFI_I3_H__ #endif // ROFI_I3_H

View File

@ -1,5 +1,5 @@
#ifndef __KEYB_H__ #ifndef KEYB_H
#define __KEYB_H__ #define KEYB_H
typedef enum _KeyBindingAction typedef enum _KeyBindingAction
{ {
@ -69,4 +69,4 @@ void cleanup_abe ( void );
* @returns TRUE if key combo matches, FALSE otherwise. * @returns TRUE if key combo matches, FALSE otherwise.
*/ */
int abe_test_action ( KeyBindingAction action, unsigned int mask, KeySym key ); int abe_test_action ( KeyBindingAction action, unsigned int mask, KeySym key );
#endif // __KEYB_H__ #endif // KEYB_H

View File

@ -1,5 +1,5 @@
#ifndef __SIMPLESWITCHER_H__ #ifndef SIMPLESWITCHER_H
#define __SIMPLESWITCHER_H__ #define SIMPLESWITCHER_H
#include <X11/X.h> #include <X11/X.h>
#include <glib.h> #include <glib.h>
#include <textbox.h> #include <textbox.h>

View File

@ -1,5 +1,5 @@
#ifndef __TEXTBOX_H__ #ifndef TEXTBOX_H
#define __TEXTBOX_H__ #define TEXTBOX_H
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
#include <pango/pango.h> #include <pango/pango.h>
@ -246,4 +246,4 @@ int textbox_get_estimated_char_height ( void );
void textbox_text_markup ( textbox *tb, const char *text ); void textbox_text_markup ( textbox *tb, const char *text );
#endif //__TEXTBOX_H__ #endif //TEXTBOX_H

View File

@ -1,5 +1,5 @@
#ifndef __X11_HELPER_H__ #ifndef X11_HELPER_H
#define __X11_HELPER_H__ #define X11_HELPER_H
int window_get_prop ( Display *display, Window w, Atom prop, int window_get_prop ( Display *display, Window w, Atom prop,

View File

@ -1,5 +1,5 @@
#ifndef __XRMOPTIONS_H__ #ifndef XRMOPTIONS_H
#define __XRMOPTIONS_H__ #define XRMOPTIONS_H
// Big thanks to Sean Pringle for this code. // Big thanks to Sean Pringle for this code.
// This maps xresource options to config structure. // This maps xresource options to config structure.