Fix merge conflict

[netatalk.git] / libatalk / compat / strcasecmp.c

diff --git a/libatalk/compat/strcasecmp.c b/libatalk/compat/strcasecmp.c
index 85c70209b0a10506eb4746a1ab3ee31d2162d217..bc8cb57bd5c07b831ace4cedf98356803abb1581 100644 (file)
--- a/libatalk/compat/strcasecmp.c
+++ b/libatalk/compat/strcasecmp.c
@@ -1,4 +1,6 @@
 /*
+ * $Id: strcasecmp.c,v 1.4 2003-02-17 01:51:08 srittau Exp $
+ *
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
  *
@@ -19,9 +21,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
-static int     _strcasecmp_dummy;
+#endif /* HAVE_CONFIG_H */
 
 # if defined( ibm032 )
 
@@ -106,4 +106,4 @@ strncasecmp(s1, s2, n)
        return (0);
 }
 
-# endif ibm032
+# endif /* ibm032 */